Changeset 515 for Common

Timestamp:

Jun 5, 2018, 11:02:54 AM (6 years ago)

Author:

chronos

Message:

• Modified: PersistentForm also keep dimensions of aligned panels.
• Fixed: Theming of CoolBar.

Location:

Common

Files:

• UCommon.pas (modified) (3 diffs)
• UPersistentForm.pas (modified) (3 diffs)
• UTheme.pas (modified) (1 diff)

Common/UCommon.pas

@@ -73 +73 @@
 function LoadFileToStr(const FileName: TFileName): AnsiString;
 procedure SearchFiles(AList: TStrings; Dir: string;
-  FilterMethod: TFilterMethodMethod);
+  FilterMethod: TFilterMethodMethod = nil);
 function GetStringPart(var Text: string; Separator: string): string;
 
@@ -524 +524 @@
 
 procedure SearchFiles(AList: TStrings; Dir: string;
-  FilterMethod: TFilterMethodMethod);
+  FilterMethod: TFilterMethodMethod = nil);
 var
   SR: TSearchRec;
@@ -532 +532 @@
     try
       repeat
-        if (SR.Name = '.') or (SR.Name = '..') or not FilterMethod(SR.Name) or
-          not FilterMethod(Copy(Dir, 3, Length(Dir)) + SR.Name) then Continue;
+        if (SR.Name = '.') or (SR.Name = '..') or (Assigned(FilterMethod) and (not FilterMethod(SR.Name) or
+          not FilterMethod(Copy(Dir, 3, Length(Dir)) + SR.Name))) then Continue;
         AList.Add(Dir + SR.Name);
         if (SR.Attr and faDirectory) <> 0 then

Common/UPersistentForm.pas

@@ -8 +8 @@
 
 uses
-  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls;
+  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls,
+  ExtCtrls;
 
 type
@@ -71 +72 @@
   end;
 
+  if (Control is TPanel) then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      if (TPanel(Control).Align = alRight) or (TPanel(Control).Align = alLeft) then begin
+        if ValueExists('Width') then
+          TPanel(Control).Width := ReadInteger('Width');
+      end;
+      if (TPanel(Control).Align = alTop) or (TPanel(Control).Align = alBottom) then begin
+        if ValueExists('Height') then
+          TPanel(Control).Height := ReadInteger('Height');
+      end;
+    finally
+      Free;
+    end;
+  end;
+
   if Control is TWinControl then begin
     WinControl := TWinControl(Control);
@@ -95 +114 @@
       for I := 0 to TListView(Control).Columns.Count - 1 do begin
         WriteInteger('ColWidth' + IntToStr(I), TListView(Control).Columns[I].Width);
+      end;
+    finally
+      Free;
+    end;
+  end;
+
+  if (Control is TPanel) then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      if (TPanel(Control).Align = alRight) or (TPanel(Control).Align = alLeft) then begin
+        WriteInteger('Width', TPanel(Control).Width);
+      end;
+      if (TPanel(Control).Align = alTop) or (TPanel(Control).Align = alBottom) then begin
+        WriteInteger('Height', TPanel(Control).Height);
       end;
     finally

Common/UTheme.pas

@@ -158 +158 @@
         ApplyTheme(TPageControl(Component).Pages[I]);
     end;
+
+    if Control is TCoolBar then begin
+      (Control as TCoolBar).Themed := False;
+    end;
   end;
 end;