Added TEdit StyleHook

Fixed bug in draw of disabled TCustomLabel Fixed bug in draw of TRadioButton in wrong Vert. position Improved performance of Detour_WinApi_DrawTextEx Added support for version control forms TVersionControlSelect TCheckoutDialog TGitCheckoutDialog TUseUnitDialog TdlgRepoBrowser

Author: RRUZ

delphi-ide-theme-editor/IDE PlugIn/Colorizer.Hook.Forms.pas

@@ -164,6 +164,12 @@ function HandleColorizerStyleMessage(Self : TWinControl;var Message: TMessage; W
  begin
  HookedControls.Add(Self, TColorizerStatusBarStyleHook.Create(Self));
  LHook:=HookedControls[Self];
+ end
+ else
+ if Self is TEdit then
+ begin
+ HookedControls.Add(Self, TColorizerEditStyleHook.Create(Self));
+ LHook:=HookedControls[Self];
  end;
 
 

delphi-ide-theme-editor/IDE PlugIn/Colorizer.Hooks.IDE.pas

@@ -85,10 +85,6 @@ implementation
  GraphUtil,
  SysUtils,
  CaptionedDockTree,
-
- JclDebug,
- Dialogs,
-
  Graphics;
 
 type
@@ -749,7 +745,7 @@ function Detour_TDockCaptionDrawer_DrawDockCaption(Self : TDockCaptionDrawerClas
  Canvas.Pen.Color := TColorizerLocalSettings.ColorMap.FrameTopLeftInner;
 
  CaptionRect.Top := CaptionRect.Top + 1;
- if not (TColorizerLocalSettings.Settings.UseVCLStyles and TColorizerLocalSettings.Settings.VCLStylesForms) then
+ if  TColorizerLocalSettings.Settings.DockCustomColors or not (TColorizerLocalSettings.Settings.UseVCLStyles and TColorizerLocalSettings.Settings.VCLStylesForms) then
  begin
  if State.Focused then
  begin
@@ -1007,49 +1003,6 @@ function Detour_TDockCaptionDrawer_DrawDockCaption(Self : TDockCaptionDrawerClas
  sPopupSearchForm_PaintCategoryNode = '@Popupsrchfrm@TPopupSearchForm@PaintCategoryNode$qqrp28Idevirtualtrees@TVirtualNodep20Vcl@Graphics@TCanvasr18System@Types@TRectp33Ideinsightmgr@TIDEInsightCategoryo';
  sPopupSearchForm_PaintItemNode = '@Popupsrchfrm@TPopupSearchForm@PaintItemNode$qqrp28Idevirtualtrees@TVirtualNodep20Vcl@Graphics@TCanvasr18System@Types@TRectp29Ideinsightmgr@TIDEInsightItemo';
 
-
-//var
-// TrampolineOpenKey : function (Self: TObject;const Key: string; CanCreate: Boolean): Boolean;
-// TrampolineInternalLoadPropValues : procedure (Self: TObject);
-//
-//
-//function DetourOpenKey(Self: TObject;const Key: string; CanCreate: Boolean): Boolean;
-//var
-// sCaller : string;
-// i : integer;
-//begin
-// if pos('Hot Link', Key)>1 then
-// begin
-// for i:=1 to 5 do
-// begin
-// sCaller := ProcByLevel(i);
-// AddLog2(Format('Level %d %s Key %s',[i, sCaller, Key]));
-// end;
-// AddLog2('');
-// end;
-//
-// Result:= TrampolineOpenKey(Self, key, CanCreate);
-//end;
-
-//@Idereginipropset@TRegistryPropSet@InternalLoadPropValues$qqrv
-
-//procedure DetourInternalLoadPropValues(Self: TObject);
-//var
-// sCaller : string;
-// i : integer;
-//begin
-//// if pos('Hot Link', Key)>1 then
-// begin
-// for i:=1 to 5 do
-// begin
-// sCaller := ProcByLevel(i);
-// AddLog2(Format('Level %d %s',[i, sCaller]));
-// end;
-// AddLog2('');
-// end;
-// TrampolineInternalLoadPropValues(Self);
-//end;
-
 procedure InstallHooksIDE;
 var
 {$IFDEF DELPHIXE6_UP}

delphi-ide-theme-editor/IDE PlugIn/Colorizer.Hooks.Windows.pas

@@ -314,7 +314,7 @@ function Detour_WinApi_DrawText(hDC: HDC; lpString: LPCWSTR; nCount: Integer; v
  RestoreColor:=False;
  sCaller:='';
 
- if (uFormat=2084) and Assigned(TColorizerLocalSettings.Settings) and TColorizerLocalSettings.Settings.Enabled and Assigned(TColorizerLocalSettings.ColorMap) then
+ if {(uFormat AND DT_CALCRECT = 0) and} (uFormat=2084) and Assigned(TColorizerLocalSettings.Settings) and TColorizerLocalSettings.Settings.Enabled and Assigned(TColorizerLocalSettings.ColorMap) then
  begin
  OrgColor:=GetTextColor(hDC);
  LFontColor :=ColorToRGB(TColorizerLocalSettings.ColorMap.FontColor);
@@ -405,7 +405,8 @@ function Detour_WinApi_DrawTextEx(DC: HDC; lpchText: LPCWSTR; cchText: Integer;
 {$IFDEF DELPHIXE6_UP}
  OrgColor:=0;
  RestoreColor:=False;
- if Assigned(TColorizerLocalSettings.Settings) and TColorizerLocalSettings.Settings.Enabled and Assigned(TColorizerLocalSettings.ColorMap) then
+
+ if (dwDTFormat AND DT_CALCRECT = 0) and Assigned(TColorizerLocalSettings.Settings) and TColorizerLocalSettings.Settings.Enabled and Assigned(TColorizerLocalSettings.ColorMap) then
  begin
  OrgColor:= GetTextColor(DC);
  if (TColor(OrgColor) = clWhite) or (TColor(OrgColor) = clBlack) then

delphi-ide-theme-editor/IDE PlugIn/Colorizer.Hooks.pas

@@ -48,6 +48,8 @@ implementation
  Colorizer.uxThemeHelper,
 {$ENDIF}
  Messages,
+ System.Diagnostics,
+ System.TimeSpan,
  TypInfo,
  Forms,
  ExtCtrls,
@@ -109,6 +111,7 @@ TCustomActionPopupMenuClass = class(TCustomActionPopupMenu);
  TCustomControlClass = class(TCustomControl);
  TCustomControlBarClass = class(TCustomControlBar);
  TCustomButtonClass = class(TCustomButton);
+ TCustomLabelClass = class(TCustomLabel);
 var
  {$IF CompilerVersion<27} //XE6
  TrampolineCustomImageList_DoDraw : procedure (Self: TObject; Index: Integer; Canvas: TCanvas; X, Y: Integer; Style: Cardinal; Enabled: Boolean) = nil;
@@ -148,7 +151,9 @@ TCustomButtonClass = class(TCustomButton);
  Trampoline_HintWindow_Paint : procedure (Self : THintWindow) = nil;
  Trampoline_MessageHintWindow_Paint : procedure (Self : THintWindow) = nil;
  Trampoline_Bevel_Paint : procedure (Self : TBevel) = nil;
- Trampoline_TCustomControlBar_PaintControlFrame : procedure (Self:TCustomControlBar; Canvas: TCanvas; AControl: TControl; var ARect: TRect)=nil;
+ Trampoline_TCustomControlBar_PaintControlFrame : procedure (Self:TCustomControlBar; Canvas: TCanvas; AControl: TControl; var ARect: TRect) = nil;
+ Trampoline_TCustomLabel_DoDrawText : procedure (Self : TCustomLabel;var Rect: TRect; Flags: Longint) = nil;
+
 
  //Trampoline_TCustomActionPopupMenu_CreateParams : procedure(Self: TCustomActionPopupMenu;var Params: TCreateParams) = nil;
 
@@ -224,6 +229,122 @@ TDWordFiller = record
  end;
 {$ENDIF}
 
+
+procedure Detour_TCustomLabelClass_DoDrawText(Self : TCustomLabelClass;var Rect: TRect; Flags: Longint);
+const
+ EllipsisStr = '...';
+ Ellipsis: array[TEllipsisPosition] of Longint = (0, DT_PATH_ELLIPSIS,
+ DT_END_ELLIPSIS, DT_WORD_ELLIPSIS);
+var
+ LParentForm : TCustomForm;
+ LRect: TRect;
+ Height, Delim: Integer;
+ LText, DText: string;
+
+ procedure DrawStyledText(DC: HDC; const Text: UnicodeString; var TextRect: TRect; TextFlags: Cardinal);
+ const
+ CStates: array[Boolean] of TThemedTextLabel = (ttlTextLabelDisabled, ttlTextLabelNormal);
+ var
+ LFormat: TTextFormat;
+ LOptions: TStyleTextOptions;
+ begin
+ LFormat := TTextFormatFlags(TextFlags);
+ if csGlassPaint in Self.ControlState then
+ Include(LFormat, tfComposited);
+
+ LOptions.Flags := [stfTextColor, stfGlowSize];
+ LOptions.TextColor := Self.Canvas.Font.Color;
+ LOptions.GlowSize := Self.GlowSize;
+
+ ColorizerStyleServices.DrawText(DC,
+ ColorizerStyleServices.GetElementDetails(CStates[Self.Enabled]), Text, TextRect, LFormat, LOptions);
+ end;
+
+ procedure DrawNormalText(DC: HDC; const Text: UnicodeString; var TextRect: TRect; TextFlags: Cardinal);
+ begin
+ Windows.DrawTextW(DC, Text, Length(Text), TextRect, TextFlags);
+ end;
+
+begin
+ if (Assigned(TColorizerLocalSettings.Settings) and not TColorizerLocalSettings.Settings.Enabled) or (csDesigning in Self.ComponentState) or (not Assigned(TColorizerLocalSettings.ColorMap)) then
+ begin
+ Trampoline_TCustomLabel_DoDrawText(Self, Rect, Flags);
+ exit;
+ end;
+
+ LParentForm:= GetParentForm(Self);
+ if not (Assigned(LParentForm) and Assigned(TColorizerLocalSettings.HookedWindows) and (TColorizerLocalSettings.HookedWindows.IndexOf(LParentForm.ClassName)>=0)) then
+ begin
+ Trampoline_TCustomLabel_DoDrawText(Self, Rect, Flags);
+ exit;
+ end;
+
+ if Self.Enabled then
+ begin
+ Trampoline_TCustomLabel_DoDrawText(Self, Rect, Flags);
+ exit;
+ end
+ else
+ begin
+ LText := Self.Caption;
+ if (Flags and DT_CALCRECT <> 0) and
+ ((LText = '') or Self.ShowAccelChar and (LText[1] = '&') and (Length(LText) = 1)) then
+ LText := LText + ' ';
+
+ if LText <> '' then
+ begin
+ if not Self.ShowAccelChar then Flags := Flags or DT_NOPREFIX;
+ Flags := Self.DrawTextBiDiModeFlags(Flags);
+ Self.Canvas.Font := Self.Font;
+ if (Self.EllipsisPosition <> epNone) and not Self.AutoSize then
+ begin
+ DText := LText;
+ Flags := Flags and not DT_EXPANDTABS;
+ Flags := Flags or Ellipsis[Self.EllipsisPosition];
+ if Self.WordWrap and (Self.EllipsisPosition in [epEndEllipsis, epWordEllipsis]) then
+ begin
+ repeat
+ LRect := Rect;
+ Dec(LRect.Right, Self.Canvas.TextWidth(EllipsisStr));
+
+ if TColorizerLocalSettings.Settings.UseVCLStyles and TColorizerLocalSettings.Settings.VCLStylesControls then
+ DrawStyledText(Self.Canvas.Handle, DText, LRect, Flags or DT_CALCRECT)
+ else
+ DrawNormalText(Self.Canvas.Handle, DText, LRect, Flags or DT_CALCRECT);
+
+ Height := LRect.Bottom - LRect.Top;
+ if (Height > Self.ClientHeight) and (Height > Self.Canvas.Font.Height) then
+ begin
+ Delim := LastDelimiter(' '#9, LText);
+ if Delim = 0 then
+ Delim := Length(LText);
+ Dec(Delim);
+ if ByteType(LText, Delim) = mbLeadByte then
+ Dec(Delim);
+ LText := Copy(LText, 1, Delim);
+ DText := LText + EllipsisStr;
+ if LText = '' then
+ Break;
+ end
+ else
+ Break;
+ until False;
+ end;
+ if LText <> '' then
+ LText := DText;
+ end;
+
+ if TColorizerLocalSettings.Settings.UseVCLStyles and TColorizerLocalSettings.Settings.VCLStylesControls then
+ DrawStyledText(Self.Canvas.Handle, LText, Rect, Flags)
+ else
+ begin
+ Self.Canvas.Font.Color:=TColorizerLocalSettings.ColorMap.DisabledFontColor;
+ DrawNormalText(Self.Canvas.Handle, LText, Rect, Flags);
+ end;
+ end;
+ end;
+end;
+
 procedure Detour_TCustomControlBar_PaintControlFrame(Self:TCustomControlBarClass; Canvas: TCanvas; AControl: TControl; var ARect: TRect);
 const
  Offset = 3;
@@ -2526,12 +2647,18 @@ procedure Detour_TCanvas_FillRect(Self: TCanvas;const Rect: TRect);
 var
  sCaller : string;
  OrgBrush : Integer; //don't use SaveDC
+// Stopwatch: TStopwatch;
+// Elapsed: TTimeSpan;
 begin
  OrgBrush:=Self.Brush.Color;
  try
  if Assigned(TColorizerLocalSettings.Settings) and TColorizerLocalSettings.Settings.Enabled and (OrgBrush=clBtnFace) then
  begin
+ //Stopwatch := TStopwatch.StartNew;
  sCaller := ProcByLevel(1);
+ //Elapsed := Stopwatch.Elapsed;
+ //AddLog2(Format('ProcByLevel(1) Elapsed %n ms ',[elapsed.TotalMilliseconds]));
+
  if SameText(sCaller, sEditorControlSignature) then
  Self.Brush.Color:=GetGutterBkColor
  else
@@ -3018,7 +3145,7 @@ procedure InstallColorizerHooks;
 
  Trampoline_TButtonControl_WndProc := InterceptCreate(@TButtonControlClass.WndProc, @Detour_TButtonControlClass_WndProc);
 // *******************************************
-
+ Trampoline_TCustomLabel_DoDrawText := InterceptCreate(@TCustomLabelClass.DoDrawText, @Detour_TCustomLabelClass_DoDrawText);
 end;
 
 procedure RemoveColorizerHooks;
@@ -3064,6 +3191,7 @@ procedure RemoveColorizerHooks;
  InterceptRemove(@Trampoline_TCustomGroupBox_Paint);
  InterceptRemove(@Trampoline_CustomComboBox_WMPaint);
  InterceptRemove(@Trampoline_TCustomCombo_WndProc);
+ InterceptRemove(@Trampoline_TCustomLabel_DoDrawText);
 end;
 
 end.