DIC - Improved support for VCL Styles on docked forms

DIC - Fixed text color on device platform selector XE7 DIC - Fixed text color on Multiview combobox XE7 DIC - Code refactoring on UxThemes Hooks DIC - Added style support for TEvalDialog form DITE - Fixed bug on Help Insight

Author: RRUZ

delphi-ide-theme-editor/BuildDITE.bat

@@ -6,7 +6,7 @@ pause
 EXIT
 
 :INNO
-"C:\Program Files (x86)\Inno Setup 5\iscc.exe" "C:\Delphi\google-code\DITE\delphi-ide-theme-editor\DelphiIDEThemeEditor.iss"
+"C:\Program Files (x86)\Inno Setup 5\iscc.exe" "C:\Dephi\google-code\delphi-ide-theme-editor\DelphiIDEThemeEditor.iss"
 set INNO_STATUS=%ERRORLEVEL%
 if %INNO_STATUS%==0 GOTO END
 pause

delphi-ide-theme-editor/DITE.dproj

@@ -108,14 +108,14 @@
  <DCC_DebugInformation>false</DCC_DebugInformation>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
- <VerInfo_Release>5</VerInfo_Release>
+ <VerInfo_Release>8</VerInfo_Release>
  <DCC_DebugInformation>true</DCC_DebugInformation>
  <DCC_MapFile>3</DCC_MapFile>
  <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
  <VerInfo_MinorVer>7</VerInfo_MinorVer>
  <VerInfo_Build>0</VerInfo_Build>
  <DCC_UNIT_PLATFORM>false</DCC_UNIT_PLATFORM>
- <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.7.5.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+ <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.7.8.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
  <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
  </PropertyGroup>
  <ItemGroup>

delphi-ide-theme-editor/DITE.res

@@ -1918,7 +1918,7 @@ AppSupportURL=http://theroadtodelphi.wordpress.com/
 AppUpdatesURL=http://theroadtodelphi.wordpress.com/
 DefaultDirName={pf}\The Road To Delphi\Delphi IDE Theme Editor
 ;OutputDir=C:\Delphi\google-code\DITE\delphi-ide-theme-editor
-OutputBaseFileName=Setup_DelphiIDEThemeEditor
+OutputBaseFileName=Setup_DITE
 DisableDirPage=false
 Compression=lzma
 SolidCompression=true

delphi-ide-theme-editor/DelphiIDEThemeEditor.iss

@@ -54,6 +54,9 @@ interface
 {$IFDEF DELPHIXE6} sModernThemeModule = 'ModernTheme200.bpl';{$ENDIF}
 {$IFDEF DELPHIXE7} sModernThemeModule = 'ModernTheme210.bpl';{$ENDIF}
 
+{$IFDEF DELPHIXE7} sdesignideModule = 'designide210.bpl';{$ENDIF}
+
+
 procedure InstallHooksIDE;
 Procedure RemoveHooksIDE;
 
@@ -64,6 +67,8 @@ implementation
  Colorizer.Vcl.Styles,
  Vcl.Styles,
  Vcl.Themes,
+ {$ELSE}
+ Themes,
  {$ENDIF}
  Colorizer.VirtualTrees,
  Colorizer.Wrappers,
@@ -135,6 +140,19 @@ TDockCaptionDrawerClass = class(TDockCaptionDrawer);
  {$ENDIF}
  Trampoline_TDockCaptionDrawer_DrawDockCaption : function (Self : TDockCaptionDrawerClass;const Canvas: TCanvas; CaptionRect: TRect; State: TParentFormState): TDockCaptionHitTest =nil;
 
+{
+@Viewselector@TViewSelectorFrame@cbStyleSelectorDrawItem$qqrp24Vcl@Controls@TWinControlirx18System@Types@TRect60System@%Set$32Winapi@Windows@Winapi_Windows__1t1$i0$t1$i12$%
+@Viewselector@TViewSelectorFrame@cbStyleSelectorChange$qqrp14System@TObject
+@Viewselector@TViewSelectorFrame@cbDeviceSelectorDrawItem$qqrp24Vcl@Controls@TWinControlirx18System@Types@TRect60System@%Set$32Winapi@Windows@Winapi_Windows__1t1$i0$t1$i12$%
+
+ 000AE804 4530 1440 __fastcall Viewselector::TViewSelectorFrame::cbDeviceSelectorDrawItem(Vcl::Controls::TWinControl *, int, System::Types::TRect&, System::Set<Winapi::Windows::Winapi_Windows__1, 0, 12>)
+ 000AECB4 4529 1441 __fastcall Viewselector::TViewSelectorFrame::cbStyleSelectorChange(System::TObject *)
+ 000AED9C 4528 1442 __fastcall Viewselector::TViewSelectorFrame::cbStyleSelectorDrawItem(Vcl::Controls::TWinControl *, int, System::Types::TRect&, System::Set<Winapi::Windows::Winapi_Windows__1, 0, 12>)
+
+ TDrawItemEvent = procedure(Control: TWinControl; Index: Integer;
+ Rect: TRect; State: TOwnerDrawState) of object;
+
+}
 procedure CustomProjectTree2PaintText(Self : TObject; Sender: TObject{TBaseVirtualTree}; const TargetCanvas: TCanvas; Node: {PVirtualNode}Pointer; Column: Integer{TColumnIndex}; TextType: Byte {TVSTTextType});
 begin
  //TargetCanvas.Font.Color:=clRed;
@@ -701,6 +719,12 @@ function Detour_TDockCaptionDrawer_DrawDockCaption(Self : TDockCaptionDrawerClas
  ShouldDrawClose: Boolean;
  CloseRect, PinRect: TRect;
  LPngImage : TPngImage;
+ {$IFDEF DELPHIXE2_UP}
+ LDetails : TThemedElementDetails;
+ LStyleServices : TCustomStyleServices;
+ SavedIndex : Integer;
+ {$ENDIF}
+
 begin
 
  if (Assigned(TColorizerLocalSettings.Settings) and not TColorizerLocalSettings.Settings.Enabled) or (not TColorizerLocalSettings.Settings.DockCustom) or (not Assigned(TColorizerLocalSettings.ColorMap)) then
@@ -720,7 +744,8 @@ function Detour_TDockCaptionDrawer_DrawDockCaption(Self : TDockCaptionDrawerClas
  Canvas.Pen.Color := TColorizerLocalSettings.ColorMap.FrameTopLeftInner;
 
  CaptionRect.Top := CaptionRect.Top + 1;
-
+ if not TColorizerLocalSettings.Settings.UseVCLStyles then
+ begin
  if State.Focused then
  begin
  if not TColorizerLocalSettings.Settings.DockCustomColors then
@@ -785,6 +810,24 @@ function Detour_TDockCaptionDrawer_DrawDockCaption(Self : TDockCaptionDrawerClas
  Canvas.Brush.Style:=bsClear;
  Canvas.Rectangle(CaptionRect);
  end;
+ end
+ else
+ begin
+ {$IFDEF DELPHIXE2_UP}
+ LStyleServices:= ColorizerStyleServices;
+ if State.Focused then
+ LDetails:=LStyleServices.GetElementDetails(twSmallCaptionActive)
+ else
+ LDetails:=LStyleServices.GetElementDetails(twSmallCaptionInactive);
+
+ SavedIndex := SaveDC(Canvas.Handle);
+ try
+ LStyleServices.DrawElement(Canvas.Handle, LDetails, CaptionRect);
+ finally
+ RestoreDC(Canvas.Handle, SavedIndex);
+ end;
+ {$ENDIF}
+ end;
 
  CloseRect := GetCloseRect(CaptionRect);