Skip to content
Permalink
Browse files

Update code from vcl-styles-utils to current master branch from April…

… 03 2019. Disables LegacyIFEND compiler flag so Vcl.Styles.FontAwesome.pas compiles without modification.
  • Loading branch information...
ansgarbecker committed Jul 21, 2019
1 parent fbdddaa commit cfe412e12c155c4a8d86a4802272332cb92094a5
Showing with 8,101 additions and 6,471 deletions.
  1. +2 −2 packages/Delphi10.2/heidisql.dproj
  2. +3 −2 packages/Delphi10.3/heidisql.dproj
  3. +1 −1 packages/delphiXE5/heidisql.dproj
  4. +1 −10 source/vcl-styles-utils/Vcl.PlatformVclStylesActnCtrls.pas
  5. +261 −253 source/vcl-styles-utils/Vcl.Styles.ColorTabs.pas
  6. +1 −1 source/vcl-styles-utils/Vcl.Styles.ControlColor.pas
  7. +297 −0 source/vcl-styles-utils/Vcl.Styles.DPIAware.pas
  8. +20 −16 source/vcl-styles-utils/Vcl.Styles.DbGrid.pas
  9. +327 −391 source/vcl-styles-utils/Vcl.Styles.Ext.pas
  10. +1 −1 source/vcl-styles-utils/Vcl.Styles.Fixes.pas
  11. +11 −14 source/vcl-styles-utils/Vcl.Styles.FontAwesome.pas
  12. +236 −234 source/vcl-styles-utils/Vcl.Styles.Hooks.pas
  13. +8 −1 source/vcl-styles-utils/Vcl.Styles.NC.pas
  14. +118 −113 source/vcl-styles-utils/Vcl.Styles.OwnerDrawFix.pas
  15. +603 −0 source/vcl-styles-utils/Vcl.Styles.Preview.pas
  16. +17 −0 source/vcl-styles-utils/Vcl.Styles.Register.pas
  17. +1 −1 source/vcl-styles-utils/Vcl.Styles.Utils.ComCtrls.pas
  18. +2 −1 source/vcl-styles-utils/Vcl.Styles.Utils.Forms.pas
  19. +963 −1,000 source/vcl-styles-utils/Vcl.Styles.Utils.Graphics.pas
  20. +3 −4 source/vcl-styles-utils/Vcl.Styles.Utils.Menus.pas
  21. +825 −0 source/vcl-styles-utils/Vcl.Styles.Utils.Misc.pas
  22. +1 −1 source/vcl-styles-utils/Vcl.Styles.Utils.ScreenTips.pas
  23. +2 −9 source/vcl-styles-utils/Vcl.Styles.Utils.StdCtrls.pas
  24. +4 −435 source/vcl-styles-utils/Vcl.Styles.Utils.SysControls.pas
  25. +5 −4 source/vcl-styles-utils/Vcl.Styles.Utils.SysStyleHook.pas
  26. +83 −83 source/vcl-styles-utils/Vcl.Styles.Utils.SystemMenu.pas
  27. +3,970 −3,569 source/vcl-styles-utils/Vcl.Styles.UxTheme.pas
  28. +335 −325 source/vcl-styles-utils/Vcl.Styles.WebBrowser.pas
@@ -75,7 +75,7 @@
<DCC_F>false</DCC_F>
<VerInfo_Locale>1033</VerInfo_Locale>
<SanitizedProjectName>heidisql</SanitizedProjectName>
<DCC_LegacyIFEND>true</DCC_LegacyIFEND>
<DCC_LegacyIFEND>false</DCC_LegacyIFEND>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -120,7 +120,7 @@
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
<DCC_LegacyIFEND>true</DCC_LegacyIFEND>
<DCC_LegacyIFEND>false</DCC_LegacyIFEND>
<DCC_DebugInformation>2</DCC_DebugInformation>
<DCC_Define>madExcept;$(DCC_Define)</DCC_Define>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -75,7 +75,7 @@
<DCC_F>false</DCC_F>
<VerInfo_Locale>1033</VerInfo_Locale>
<SanitizedProjectName>heidisql</SanitizedProjectName>
<DCC_LegacyIFEND>true</DCC_LegacyIFEND>
<DCC_LegacyIFEND>false</DCC_LegacyIFEND>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<DCC_Namespace>Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -100,6 +100,7 @@
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
<DCC_LegacyIFEND>false</DCC_LegacyIFEND>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -120,7 +121,7 @@
<BT_BuildType>Debug</BT_BuildType>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
<DCC_LegacyIFEND>true</DCC_LegacyIFEND>
<DCC_LegacyIFEND>false</DCC_LegacyIFEND>
<DCC_DebugInformation>2</DCC_DebugInformation>
<DCC_Define>madExcept;$(DCC_Define)</DCC_Define>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -113,7 +113,7 @@
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
<DCC_LegacyIFEND>true</DCC_LegacyIFEND>
<DCC_LegacyIFEND>false</DCC_LegacyIFEND>
<Manifest_File>None</Manifest_File>
<DCC_DebugInformation>2</DCC_DebugInformation>
<DCC_Define>madExcept;$(DCC_Define)</DCC_Define>
@@ -15,7 +15,7 @@
// The Original Code is Vcl.PlatformVclStylesActnCtrls
//
// The Initial Developer of the Original Code is Rodrigo Ruz V.
// Portions created by Rodrigo Ruz V. are Copyright (C) 2012-2016 Rodrigo Ruz V.
// Portions created by Rodrigo Ruz V. are Copyright (C) 2012-2019 Rodrigo Ruz V.
// All Rights Reserved.
//
//**************************************************************************************************
@@ -251,10 +251,7 @@ procedure TThemedMenuItemEx.NativeDrawText(DC: HDC; const Text: string;
LFormats: TTextFormat;
LColor: TColor;
LDetails: TThemedElementDetails;
//LNativeStyle : TCustomStyleServices;
begin
//LNativeStyle:=TStyleManager.SystemStyle;

LFormats := TTextFormatFlags(Flags);
if Selected and Enabled then
begin
@@ -273,7 +270,6 @@ procedure TThemedMenuItemEx.NativeDrawText(DC: HDC; const Text: string;
LCaption := LCaption + ' ';



//LNativeStyle.DrawText(DC, LDetails, LCaption, Rect, LFormats, LColor); //doesn't work when the windows classic theme is applied in the OS
//StyleServices.DrawText(DC, LDetails, LCaption, Rect, LFormats, LColor); //doesn't work with custom fonts sizes and types
InternalDrawText(DC, LDetails, LCaption, Rect, LFormats, LColor);
@@ -321,10 +317,7 @@ procedure TThemedMenuButtonEx.NativeDrawText(const Text: string; var Rect: TRect
LFormats: TTextFormat;
LColor: TColor;
LDetails: TThemedElementDetails;
//LNativeStyle : TCustomStyleServices;
begin
//LNativeStyle:=TStyleManager.SystemStyle;

LFormats := TTextFormatFlags(Flags);
if Enabled then
LDetails := StyleServices.GetElementDetails(MenuStates[Selected or MouseInControl or ActionBar.DesignMode])
@@ -368,11 +361,9 @@ procedure TThemedMenuButtonEx.DrawText(var ARect: TRect; var Flags: Cardinal;
if Parent is TCustomActionMainMenuBar then
if not TCustomActionMainMenuBar(Parent).PersistentHotkeys then
Text := StripHotkey(Text);
// VER barra memnu Paint
LRect := ARect;
Inc(LRect.Left);
Canvas.Font := Screen.MenuFont;
//LRect.Top:=-10;
NativeDrawText(Text, LRect, Flags or DT_CALCRECT or DT_NOCLIP);
NativeDrawText(Text, LRect, Flags);
end;

0 comments on commit cfe412e

Please sign in to comment.
You can’t perform that action at this time.