Skip to content

Commit 87edc74

Browse files
committed
DIC -improved performance in load of project options form
DIC -improved performance in load of DIC options form Fixed issue RRUZ#78
1 parent 8b49882 commit 87edc74

33 files changed

+189
-113
lines changed

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Ext.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// The Original Code is Vcl.Styles.Ext.pas.
1616
//
1717
// The Initial Developer of the Original Code is Rodrigo Ruz V.
18-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2012-2014 Rodrigo Ruz V.
18+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2012-2015 Rodrigo Ruz V.
1919
// All Rights Reserved.
2020
//
2121
//**************************************************************************************************

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Utils.FlatControls.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
//
1616
// Portions created by Mahdi Safsafi [SMP3] e-mail SMP@LIVE.FR
17-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2013-2014 Rodrigo Ruz V.
17+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2013-2015 Rodrigo Ruz V.
1818
// All Rights Reserved.
1919
//
2020
// **************************************************************************************************

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Utils.FlatMenus.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
//
1616
// Portions created by Mahdi Safsafi [SMP3] e-mail SMP@LIVE.FR
17-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2013-2014 Rodrigo Ruz V.
17+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2013-2015 Rodrigo Ruz V.
1818
// All Rights Reserved.
1919
//
2020
// **************************************************************************************************

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Utils.FlatStyleHook.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// and limitations under the License.
1414
//
1515
// Portions created by Mahdi Safsafi [SMP3] e-mail SMP@LIVE.FR
16-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2013-2014 Rodrigo Ruz V.
16+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2013-2015 Rodrigo Ruz V.
1717
// All Rights Reserved.
1818
//
1919
// **************************************************************************************************

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// The Original Code is Colorizer.HookForms.pas.
1515
//
1616
// The Initial Developer of the Original Code is Rodrigo Ruz V.
17-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2014 Rodrigo Ruz V.
17+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2015 Rodrigo Ruz V.
1818
// All Rights Reserved.
1919
//
2020
//**************************************************************************************************

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// The Original Code is Colorizer.Hooks.GDIPOBJ.pas.
1515
//
1616
// The Initial Developer of the Original Code is Rodrigo Ruz V.
17-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2014 Rodrigo Ruz V.
17+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2015 Rodrigo Ruz V.
1818
// All Rights Reserved.
1919
//
2020
//**************************************************************************************************

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// The Original Code is Colorizer.Hooks.ThemedActnCtrl.pas.
1515
//
1616
// The Initial Developer of the Original Code is Rodrigo Ruz V.
17-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2014 Rodrigo Ruz V.
17+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2015 Rodrigo Ruz V.
1818
// All Rights Reserved.
1919
//
2020
//**************************************************************************************************

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// The Original Code is Colorizer.Hooks.Windows.pas.
1515
//
1616
// The Initial Developer of the Original Code is Rodrigo Ruz V.
17-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2014 Rodrigo Ruz V.
17+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2015 Rodrigo Ruz V.
1818
// All Rights Reserved.
1919
//
2020
//**************************************************************************************************
@@ -538,8 +538,8 @@ function Detour_WinApi_ExtTextOutW(DC: HDC; X, Y: Integer; Options: Longint; Rec
538538
function Detour_WinApi_GetSysColor(nIndex: Integer): DWORD; stdcall;
539539
const
540540
SystemColor = $FF000000;
541-
var
542-
sCaller : string;
541+
//var
542+
// sCaller : string;
543543
begin
544544
if Assigned(TColorizerLocalSettings.Settings) and (TColorizerLocalSettings.Settings.Enabled) and Assigned(TColorizerLocalSettings.ColorMap) then
545545
begin
@@ -592,13 +592,13 @@ function Detour_WinApi_GetSysColor(nIndex: Integer): DWORD; stdcall;
592592
Exit(Trampoline_GetSysColor(nIndex));
593593
end;
594594

595-
COLOR_BTNFACE :
596-
if (TColor(SystemColor or Cardinal(nIndex))<>TColorizerLocalSettings.ColorMap.Color) then
597-
begin
598-
sCaller := ProcByLevel(2);
599-
if SameText(sCaller, '') then
600-
Exit(ColorToRGB(TColorizerLocalSettings.ColorMap.Color));
601-
end;
595+
// COLOR_BTNFACE : don't need this for now
596+
// if (TColor(SystemColor or Cardinal(nIndex))<>TColorizerLocalSettings.ColorMap.Color) then
597+
// begin
598+
// sCaller := ProcByLevel(2);
599+
// if SameText(sCaller, '') then
600+
// Exit(ColorToRGB(TColorizerLocalSettings.ColorMap.Color));
601+
// end;
602602

603603
end;
604604
end;
@@ -613,19 +613,21 @@ procedure InstallHooksWinAPI();
613613
begin
614614
Trampoline_DrawText := InterceptCreate(@Windows.DrawTextW, @Detour_WinApi_DrawText);
615615
Trampoline_DrawTextEx := InterceptCreate(@Windows.DrawTextEx, @Detour_WinApi_DrawTextEx);
616-
Trampoline_ExtTextOutW := InterceptCreate(@Windows.ExtTextOutW, @Detour_WinApi_ExtTextOutW);
616+
Trampoline_ExtTextOutW := InterceptCreate(@Windows.ExtTextOutW, @Detour_WinApi_ExtTextOutW); //OK
617617

618618
pOrgAddress := GetProcAddress(GetModuleHandle(user32), 'GetSysColor');
619619
if Assigned(pOrgAddress) then
620620
Trampoline_GetSysColor := InterceptCreate(pOrgAddress, @Detour_WinApi_GetSysColor);
621621

622+
pOrgAddress := GetProcAddress(GetModuleHandle(user32), 'DrawEdge');
623+
if Assigned(pOrgAddress) then
624+
Trampoline_DrawEdge := InterceptCreate(pOrgAddress, @Detour_WinApi_DrawEdge);
625+
//
626+
622627
// pOrgAddress := GetProcAddress(GetModuleHandle(user32), 'DrawFrameControl');
623628
// if Assigned(pOrgAddress) then
624629
// Trampoline_DrawFrameControl := InterceptCreate(pOrgAddress, @Detour_WinApi_DrawFrameControl);
625630

626-
pOrgAddress := GetProcAddress(GetModuleHandle(user32), 'DrawEdge');
627-
if Assigned(pOrgAddress) then
628-
Trampoline_DrawEdge := InterceptCreate(pOrgAddress, @Detour_WinApi_DrawEdge);
629631
end;
630632

631633
procedure RemoveHooksWinAPI();
@@ -634,8 +636,8 @@ procedure RemoveHooksWinAPI();
634636
InterceptRemove(@Trampoline_DrawTextEx);
635637
InterceptRemove(@Trampoline_ExtTextOutW);
636638
InterceptRemove(@Trampoline_GetSysColor);
637-
//InterceptRemove(@Trampoline_DrawFrameControl);
638639
InterceptRemove(@Trampoline_DrawEdge);
640+
//InterceptRemove(@Trampoline_DrawFrameControl);
639641
end;
640642

641643
end.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// The Original Code is Colorizer.OptionsDlg.pas.
1515
//
1616
// The Initial Developer of the Original Code is Rodrigo Ruz V.
17-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2014 Rodrigo Ruz V.
17+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2015 Rodrigo Ruz V.
1818
// All Rights Reserved.
1919
//
2020
//**************************************************************************************************
@@ -72,6 +72,7 @@ constructor TFrameColorizer.Create(AOwner: TComponent);
7272
var
7373
LForm : TFormIDEColorizerSettings;
7474
begin
75+
//AddLog2('TFrameColorizer.Create');
7576
inherited Create(AOwner);
7677
LForm := TFormIDEColorizerSettings.Create(AOwner);
7778
LForm.Name := 'DelphiIDEColorizer_SettingsForm';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// The Original Code is Colorizer.Settings.pas.
1515
//
1616
// The Initial Developer of the Original Code is Rodrigo Ruz V.
17-
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2014 Rodrigo Ruz V.
17+
// Portions created by Rodrigo Ruz V. are Copyright (C) 2011-2015 Rodrigo Ruz V.
1818
// All Rights Reserved.
1919
//
2020
//**************************************************************************************************aa

0 commit comments

Comments
 (0)