Changeset 93 for trunk/Packages/Common/UPersistentForm.pas

Timestamp:

Jul 20, 2018, 10:25:06 AM (6 years ago)

Author:

chronos

Message:

• Modified: Updated Common, CoolTranslator and TemplateGenerics packages.
• Fixed: FormMain initialization was not completed if last opened file was not found.

Location:

trunk

Files:

• . (modified) (1 prop)
• Packages/Common/UPersistentForm.pas (modified) (7 diffs)

trunk

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg

trunk/Packages/Common/UPersistentForm.pas

@@ -8 +8 @@
 
 uses
-  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls;
+  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls,
+  ExtCtrls;
 
 type
@@ -26 +27 @@
     FormWindowState: TWindowState;
     Form: TForm;
-    DefaultFormWindowState: TWindowState;
     procedure LoadFromRegistry(RegistryContext: TRegistryContext);
     procedure SaveToRegistry(RegistryContext: TRegistryContext);
     function CheckEntireVisible(Rect: TRect): TRect;
     function CheckPartVisible(Rect: TRect; Part: Integer): TRect;
-    procedure Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
+    procedure Load(Form: TForm; DefaultMaximized: Boolean = False);
     procedure Save(Form: TForm);
     constructor Create(AOwner: TComponent); override;
@@ -72 +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);
@@ -96 +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
@@ -135 +169 @@
       + FormRestoredSize.Top;
     // Other state
-    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(DefaultFormWindowState)));
+    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
   finally
     Free;
@@ -216 +250 @@
 end;
 
-procedure TPersistentForm.Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
+procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
 begin
   Self.Form := Form;
-  Self.DefaultFormWindowState := DefaultFormWindowState;
-
   // Set default
   FormNormalSize := Bounds((Screen.Width - Form.Width) div 2,
@@ -230 +262 @@
 
   if not EqualRect(FormNormalSize, FormRestoredSize) or
-    (FormWindowState = wsMaximized) then begin
+    DefaultMaximized then begin
     // Restore to maximized state
     Form.WindowState := wsNormal;

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg