Changeset 116 for trunk/Packages/Common/Theme.pas

Timestamp:

Dec 11, 2024, 10:47:08 AM (11 days ago)

Author:

chronos

Message:

• Fixed: Dark Windows title bar was not set in subwindows.

File:

• trunk/Packages/Common/Theme.pas (modified) (5 diffs)

trunk/Packages/Common/Theme.pas

@@ -25 +25 @@
   end;
 
+  TDwmSetWindowAttribute = function(hwnd: HWND; dwAttribute: DWORD; pvAttribute: Pointer; cbAttribute: DWORD): HRESULT; stdcall;
+
   { TThemeManager }
 
@@ -31 +33 @@
     FTheme: TTheme;
     FActualTheme: TTheme;
+    DwmapiLib: TLibHandle;
+    DwmSetWindowAttribute: TDwmSetWindowAttribute;
     function Gray(C: TColor): Byte;
     procedure SetTheme(AValue: TTheme);
@@ -52 +56 @@
   ThemeNameLight = 'Light';
   ThemeNameDark = 'Dark';
+  DwmapiLibName = 'dwmapi.dll';
+  DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19;
+  DWMWA_USE_IMMERSIVE_DARK_MODE = 20;
 
 procedure Register;
@@ -158 +165 @@
 
 procedure TThemeManager.SetThemedTitleBar(AForm: TForm; Active: Bool);
-type
-  TDwmSetWindowAttribute = function(hwnd: HWND; dwAttribute: DWORD; pvAttribute: Pointer; cbAttribute: DWORD): HRESULT; stdcall;
-const
-  DwmapiLibName = 'dwmapi.dll';
-  DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19;
-  DWMWA_USE_IMMERSIVE_DARK_MODE = 20;
-var
-  DwmapiLib: TLibHandle;
-  DwmSetWindowAttribute: TDwmSetWindowAttribute;
+var
   Attr: DWord;
 begin
+  if Assigned(DwmSetWindowAttribute) and IsWindows10OrGreater(17763) then begin
+    Attr := DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1;
+    if IsWindows10OrGreater(18985) then Attr := DWMWA_USE_IMMERSIVE_DARK_MODE;
+
+    DwmSetWindowAttribute(AForm.Handle, Attr, @Active, SizeOf(Active));
+  end;
+end;
+
+procedure TThemeManager.SetTheme(AValue: TTheme);
+begin
+  if FTheme = AValue then Exit;
+  FTheme := AValue;
+  FActualTheme := FTheme;
+  {$IFDEF WINDOWS}
+  if Assigned(FTheme) and (FTheme = Themes.FindByName(ThemeNameSystem)) and IsDarkTheme then
+    FActualTheme := Themes.FindByName(ThemeNameDark);
+  {$ENDIF}
+end;
+
+constructor TThemeManager.Create(AOwner: TComponent);
+begin
+  inherited;
+  {$IFDEF WINDOWS}
   DwmapiLib := LoadLibrary(DwmapiLibName);
   if DwmapiLib <> 0 then DwmSetWindowAttribute := GetProcAddress(DwmapiLib, 'DwmSetWindowAttribute')
     else DwmSetWindowAttribute := nil;
-
-  if Assigned(DwmSetWindowAttribute) and IsWindows10OrGreater(17763) then begin
-    Attr := DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1;
-    if IsWindows10OrGreater(18985) then Attr := DWMWA_USE_IMMERSIVE_DARK_MODE;
-
-    DwmSetWindowAttribute(AForm.Handle, Attr, @Active, SizeOf(Active));
-  end;
-  if DwmapiLib <> 0 then FreeLibrary(DwmapiLib);
-end;
-
-procedure TThemeManager.SetTheme(AValue: TTheme);
-begin
-  if FTheme = AValue then Exit;
-  FTheme := AValue;
-  FActualTheme := FTheme;
-  {$IFDEF WINDOWS}
-  if Assigned(FTheme) and (FTheme = Themes.FindByName(ThemeNameSystem)) and IsDarkTheme then
-    FActualTheme := Themes.FindByName(ThemeNameDark);
-  {$ENDIF}
-end;
-
-constructor TThemeManager.Create(AOwner: TComponent);
-begin
-  inherited;
+  {$ENDIF}
+
   Themes := TThemes.Create;
   with Themes.AddNew(ThemeNameSystem) do begin
@@ -224 +224 @@
 begin
   FreeAndNil(Themes);
+  {$IFDEF WINDOWS}
+  if DwmapiLib <> 0 then FreeLibrary(DwmapiLib);
+  {$ENDIF}
   inherited;
 end;