Changeset 113

Timestamp:

Dec 10, 2024, 4:51:28 PM (11 days ago)

Author:

chronos

Message:

• Fixed: Dark theme detection for board colors.

Location:

trunk

Files:

• Game.pas (modified) (2 diffs)
• Packages/Common/Theme.pas (modified) (3 diffs)

trunk/Game.pas

@@ -151 +151 @@
 
 uses
-  Core, MetaCanvas, PixelPointer;
+  Core, MetaCanvas, PixelPointer, Theme;
 
 procedure Translate;
@@ -1146 +1146 @@
   Color: TPixel32;
 begin
-  if Core.Core.ThemeManager1.Theme.Name = 'Dark' then begin
+  if (Core.Core.ThemeManager1.Theme.Name = ThemeNameDark) or
+  ((Core.Core.ThemeManager1.Theme.Name = ThemeNameSystem) and
+  Core.Core.ThemeManager1.IsDarkTheme)
+  then begin
     case Value of
       0: Result := $222629;

trunk/Packages/Common/Theme.pas

@@ -30 +30 @@
   private
     FTheme: TTheme;
+    function Gray(C: TColor): Byte;
     procedure SetTheme(AValue: TTheme);
     procedure SetThemeName(AValue: TTheme);
@@ -35 +36 @@
     Used: Boolean;
     Themes: TThemes;
+    function IsDarkTheme: Boolean;
     procedure ApplyTheme(Component: TComponent);
     constructor Create(AOwner: TComponent); override;
@@ -93 +95 @@
     Strings.EndUpdate;
   end;
+end;
+
+{ TThemeManager }
+
+function TThemeManager.Gray(C: TColor): Byte;
+begin
+  Result := Trunc(Red(C) * 0.3 + Green(C) * 0.59 + Blue(C) * 0.11);
+end;
+
+function TThemeManager.IsDarkTheme: Boolean;
+begin
+  Result := Gray(ColorToRGB(clWindow)) < Gray(ColorToRGB(clWindowText));
 end;