fix: reload color scheme after auto-apply, reintroduce ThemeIsDark with a detection for Windows and macOS, use MetaDarkStyle units only on Windows

ansgarbecker · ansgarbecker · commit b4afc3af279c · 2026-01-26T13:51:59.000+01:00
diff --git a/heidisql.lpr b/heidisql.lpr
@@ -6,7 +6,7 @@
   {$IFDEF UNIX} cthreads, {$ENDIF}
   {$IFDEF DARWIN} iosxlocale, {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  uMetaDarkStyle, uDarkStyleParams, uDarkStyleSchemes,
+  {$IFDEF WINDOWS} uMetaDarkStyle, uDarkStyleParams, uDarkStyleSchemes, {$ENDIF}
   SysUtils, Dialogs,
   Forms, printer4lazarus, datetimectrls, LCLTranslator, Translations,
   { you can add units after this }
@@ -65,15 +65,14 @@
   end;
   if PreferredAppMode = pamForceDark then
     uMetaDarkStyle.ApplyMetaDarkStyle(DefaultDark);
-
+  {$ENDIF}
   // Switch synedit and grid colors to dark mode and vice versa
   WasDarkMode := AppSettings.ReadBool(asCurrentThemeIsDark);
-  if (not WasDarkMode) and IsDarkModeEnabled then
+  if (not WasDarkMode) and ThemeIsDark then
     AppColorSchemes.ApplyDark
-  else if WasDarkMode and (not IsDarkModeEnabled) then
+  else if WasDarkMode and (not ThemeIsDark) then
     AppColorSchemes.ApplyLight;
-  AppSettings.WriteBool(asCurrentThemeIsDark, IsDarkModeEnabled);
-  {$ENDIF}
+  AppSettings.WriteBool(asCurrentThemeIsDark, ThemeIsDark);
 
   Application.Initialize;
 
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
@@ -8,9 +8,10 @@ interface
   Classes, SysUtils, Generics.Collections, Controls, RegExpr, Math, FileUtil,
   StrUtils, Graphics, GraphUtil, LCLIntf, Forms, Clipbrd, Process, ActnList, Menus, Dialogs,
   Character, DateUtils, laz.VirtualTrees, SynEdit, SynCompletion, fphttpclient,
-  {$IFDEF WINDOWS} Windows, Registry, {$ENDIF} DelphiCompat,
+  {$IFDEF WINDOWS} Windows, Registry, uDarkStyleParams, {$ENDIF} DelphiCompat,
   dbconnection, dbstructures, jsonregistry, lazaruscompat, fpjson, SynEditKeyCmds, LazFileUtils, gettext, LazUTF8,
-  IniFiles, GraphType, Sockets, uDarkStyleParams, Contnrs;
+  IniFiles, GraphType, Sockets, Contnrs
+  {$IFDEF DARWIN} , MacOSAll {$ENDIF};
 
 type
 
@@ -416,6 +417,7 @@   TAppSettings = class(TObject)
   procedure Help(Sender: TObject; Anchor: String);
   function IsPortFree(APort: Word; const AIP: string = '127.0.0.1'): Boolean;
   function GetThemeColor(Color: TColor): TColor;
+  function ThemeIsDark: Boolean;
   function ProcessExists(pid: Cardinal; ExeNamePattern: String): Boolean;
   function SynCompletionProposalPrettyText(ImageIndex: Integer; LeftText, CenterText, RightText: String; LeftColor: TColor=-1; CenterColor: TColor=-1; RightColor: TColor=-1): String;
   function PopupComponent(Sender: TObject): TComponent;
@@ -2361,7 +2363,7 @@ function MessageDialog(const Title, Msg: string; DlgType: TMsgDlgType; Buttons:
     Dialog.Caption := MainForm.ActiveConnection.Parameters.SessionName + ': ' + Dialog.Caption;
   rx := TRegExpr.Create;
   rx.Expression := 'https?://[^\s"]+';
-  if IsDarkModeEnabled then
+  if ThemeIsDark then
     Dialog.Text := Msg
   else // See issue #2036
     Dialog.Text := rx.Replace(Msg, '<a href="$0">$0</a>', True);
@@ -2830,6 +2832,40 @@ function GetThemeColor(Color: TColor): TColor;
 end;
 
 
+function ThemeIsDark: Boolean;
+{$IFDEF DARWIN}
+var
+  cfValue: CFPropertyListRef;
+  s: CFStringRef;
+  buf: array[0..15] of UniChar;
+{$ENDIF}
+begin
+  {$IFDEF WINDOWS}
+  // This is not a system detection, but a more precise switch in MetaDarkStyle.
+  // On Windows, the user may have forced MetaDarkStyle's light mode when the system is in dark mode.
+  Result := uDarkStyleParams.IsDarkModeEnabled;
+  {$ENDIF}
+  {$IFDEF LINUX}
+  // Not yet possible to detect the system's dark mode. Ideas welcome.
+  Result := False;
+  {$ENDIF}
+  {$IFDEF DARWIN}
+  // Detect system's dark mode on macOS
+  cfValue := CFPreferencesCopyAppValue(
+    CFSTR('AppleInterfaceStyle'),
+    CFSTR('.GlobalPreferences')
+  );
+  if (cfValue <> nil) and (CFGetTypeID(cfValue) = CFStringGetTypeID) then begin
+    s := CFStringRef(cfValue);
+    if CFStringGetLength(s) <= Length(buf) then begin
+      CFStringGetCharacters(s, CFRangeMake(0, CFStringGetLength(s)), @buf[0]);
+      Result := CFStringCompare(s, CFSTR('Dark'), 0) = kCFCompareEqualTo;
+    end;
+    CFRelease(cfValue);
+  end;
+  {$ENDIF}
+end;
+
 function ProcessExists(pid: Cardinal; ExeNamePattern: String): Boolean;
 {var
   Proc: TProcessEntry32;
diff --git a/source/const.inc b/source/const.inc
@@ -8,7 +8,7 @@ const
   CRLF = #13#10;
   LB_UNIX = #10;
   LB_MAC = #13;
-  LB_WIDE = WideChar($2027);
+  LB_WIDE = system.WideChar($2027);
 
   // Placeholder text for NULL values
   TEXT_NULL = '(NULL)';
diff --git a/source/generic_types.pas b/source/generic_types.pas
@@ -317,6 +317,7 @@ procedure TAppColorSchemes.ApplyLight;
   for Scheme in Self do begin
     if Scheme.Name = SLightScheme then begin
       Scheme.Apply;
+      First.LoadFromSettings;
       Break;
     end;
   end;
@@ -329,6 +330,7 @@ procedure TAppColorSchemes.ApplyDark;
   for Scheme in Self do begin
     if Scheme.Name = SDarkScheme then begin
       Scheme.Apply;
+      First.LoadFromSettings;
       Break;
     end;
   end;
diff --git a/source/usermanager.pas b/source/usermanager.pas
@@ -7,8 +7,7 @@ interface
 uses
   SysUtils, Classes, Graphics, Controls, Forms, Dialogs, ComCtrls, StdCtrls, EditBtn, Buttons,
   ExtCtrls, ClipBrd, Generics.Collections, Generics.Defaults, RegExpr, extra_controls,
-  dbconnection, dbstructures, dbstructures.mysql, apphelpers, laz.VirtualTrees, Menus,
-  uDarkStyleParams;
+  dbconnection, dbstructures, dbstructures.mysql, apphelpers, laz.VirtualTrees, Menus;
 
 {$I const.inc}
 
@@ -288,7 +287,7 @@ procedure TUserManagerForm.FormShow(Sender: TObject);
   FColorReadPriv := clGreen;
   FColorWritePriv := clMaroon;
   FColorAdminPriv := clNavy;
-  if IsDarkModeEnabled then begin
+  if ThemeIsDark then begin
     FColorReadPriv := ColorAdjustBrightness(FColorReadPriv, 128);
     FColorWritePriv := ColorAdjustBrightness(FColorWritePriv, 128);
     FColorAdminPriv := ColorAdjustBrightness(FColorAdminPriv, 128);
