Changeset 463 for branches/highdpi/Packages/Common/Theme.pas

Timestamp:

Nov 29, 2023, 2:35:44 PM (12 months ago)

Author:

chronos

Message:

• Modified: HighDpi branch updated to trunk version.

File:

• branches/highdpi/Packages/Common/Theme.pas (moved) (moved from branches/highdpi/Packages/Common/UTheme.pas ) (10 diffs)

branches/highdpi/Packages/Common/Theme.pas

@@ -1 @@
-unit UTheme;
+unit Theme;
 
 interface
@@ -5 +5 @@
 uses
   UDpiControls, Classes, SysUtils, Graphics, ComCtrls, Controls, ExtCtrls, Menus, StdCtrls,
-  Spin, Forms, Contnrs, Grids;
+  Spin, Forms, Generics.Collections, Grids;
 
 type
@@ -19 +19 @@
   { TThemes }
 
-  TThemes = class(TObjectList)
+  TThemes = class(TObjectList<TTheme>)
     function AddNew(Name: string): TTheme;
     function FindByName(Name: string): TTheme;
@@ -42 +42 @@
   end;
 
+const
+  ThemeNameSystem = 'System';
+  ThemeNameLight = 'Light';
+  ThemeNameDark = 'Dark';
+
 procedure Register;
+
 
 implementation
@@ -74 +80 @@
 procedure TThemes.LoadToStrings(Strings: TStrings);
 var
-  Theme: TTheme;
+  I: Integer;
 begin
-  Strings.Clear;
-  for Theme in Self do
-    Strings.AddObject(Theme.Name, Theme);
+  Strings.BeginUpdate;
+  try
+    while Strings.Count < Count do Strings.Add('');
+    while Strings.Count > Count do Strings.Delete(Strings.Count - 1);
+    for I := 0 to Count - 1 do begin
+      Strings[I] := Items[I].Name;
+      Strings.Objects[I] := Items[I];
+    end;
+  finally
+    Strings.EndUpdate;
+  end;
 end;
 
@@ -97 +111 @@
   inherited;
   Themes := TThemes.Create;
-  with Themes.AddNew('System') do begin
+  with Themes.AddNew(ThemeNameSystem) do begin
     ColorWindow := clWindow;
     ColorWindowText := clWindowText;
@@ -105 +119 @@
   end;
   Theme := TTheme(Themes.First);
-  with Themes.AddNew('Dark') do begin
+  with Themes.AddNew(ThemeNameDark) do begin
     ColorWindow := RGBToColor($20, $20, $20);
     ColorWindowText := clWhite;
@@ -112 +126 @@
     ColorControlSelected := RGBToColor(96, 125, 155);
   end;
-  with Themes.AddNew('Light') do begin
+  with Themes.AddNew(ThemeNameLight) do begin
     ColorWindow := clWhite;
     ColorWindowText := clBlack;
@@ -123 +137 @@
 destructor TThemeManager.Destroy;
 begin
-  Themes.Free;
-  inherited Destroy;
+  FreeAndNil(Themes);
+  inherited;
 end;
 
@@ -167 +181 @@
 procedure TThemeManager.UseTheme(Form: TDpiForm);
 begin
-  if not Used and (FTheme.Name = 'System') then Exit;
+  if not Used and (FTheme.Name = ThemeNameSystem) then Exit;
   ApplyTheme(Form);
   Used := True;
 end;
 
+end.
 
-end.