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

Timestamp:

May 8, 2019, 12:11:40 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Build under Lazarus 2.0.
• Modified: Used .lrj files instead of .lrt files.
• Removed: TemplateGenerics package.

File:

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

trunk/Packages/Common/UTheme.pas

@@ -132 +132 @@
   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 +141 @@
     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;
@@ -150 +152 @@
       (Control as TCustomDrawGrid).Editor.Color := FTheme.ColorWindow;
       (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;