Changeset 25 for trunk/Packages/Common/UTheme.pas

Timestamp:

Sep 10, 2022, 6:54:43 PM (20 months ago)

Author:

chronos

Message:

• Modified: CoolTranslator replaced by Common package.
• Modified: Update common package.

File:

• trunk/Packages/Common/UTheme.pas (modified) (12 diffs)

trunk/Packages/Common/UTheme.pas

@@ -5 +5 @@
 uses
   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;
 
@@ -132 +146 @@
   I: Integer;
 begin
-  for I := 0 to Component.ComponentCount - 1 do
-    ApplyTheme(Component.Components[I]);
+  if Component is TWinControl then begin
+    for I := 0 to TWinControl(Component).ControlCount - 1 do
+      ApplyTheme(TWinControl(Component).Controls[I]);
+  end;
 
   if Component is TControl then begin
@@ -139 +155 @@
     if (Control is TEdit) or (Control is TSpinEdit) or (Control is TComboBox) and
     (Control is TMemo) or (Control is TListView) or (Control is TCustomDrawGrid) or
-    (Control is TCheckBox) then begin
+    (Control is TCheckBox) or (Control is TPageControl) or (Control is TRadioButton) then begin
       Control.Color := FTheme.ColorWindow;
       Control.Font.Color := FTheme.ColorWindowText;
@@ -151 +167 @@
       (Control as TCustomDrawGrid).Editor.Font.Color := FTheme.ColorWindowText;
     end;
+
+    if Control is TPageControl then begin
+      for I := 0 to TPageControl(Component).PageCount - 1 do
+        ApplyTheme(TPageControl(Component).Pages[I]);
+    end;
+
+    if Control is TCoolBar then begin
+      (Control as TCoolBar).Themed := False;
+    end;
   end;
 end;
@@ -156 +181 @@
 procedure TThemeManager.UseTheme(Form: TForm);
 begin
-  if not Used and (FTheme.Name = 'System') then Exit;
+  if not Used and (FTheme.Name = ThemeNameSystem) then Exit;
   ApplyTheme(Form);
   Used := True;