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

Timestamp:

Mar 22, 2018, 8:31:19 PM (6 years ago)

Author:

chronos

Message:

• Modified: Update Common and CollTranslator packages to fix build under Lazarus 1.8.
• Fixed: Some memory leaks.

File:

• trunk/Packages/Common/UPersistentForm.pas (modified) (5 diffs)

trunk/Packages/Common/UPersistentForm.pas

@@ -3 +3 @@
 {$mode delphi}
 
-// Date: 2010-06-01
+// Date: 2015-04-18
 
 interface
 
 uses
-  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry;
+  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls;
 
 type
@@ -19 +19 @@
     FMinVisiblePart: Integer;
     FRegistryContext: TRegistryContext;
+    procedure LoadControl(Control: TControl);
+    procedure SaveControl(Control: TControl);
   public
+    FormNormalSize: TRect;
+    FormRestoredSize: TRect;
+    FormWindowState: TWindowState;
+    Form: TForm;
+    procedure LoadFromRegistry(RegistryContext: TRegistryContext);
+    procedure SaveToRegistry(RegistryContext: TRegistryContext);
     function CheckEntireVisible(Rect: TRect): TRect;
     function CheckPartVisible(Rect: TRect; Part: Integer): TRect;
@@ -44 +52 @@
 { TPersistentForm }
 
+procedure TPersistentForm.LoadControl(Control: TControl);
+var
+  I: Integer;
+  WinControl: TWinControl;
+  Count: Integer;
+begin
+  if Control is TListView then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      for I := 0 to TListView(Control).Columns.Count - 1 do begin
+        if ValueExists('ColWidth' + IntToStr(I)) then
+          TListView(Control).Columns[I].Width := ReadInteger('ColWidth' + IntToStr(I));
+      end;
+    finally
+      Free;
+    end;
+  end;
+
+  if Control is TWinControl then begin
+    WinControl := TWinControl(Control);
+    if WinControl.ControlCount > 0 then begin
+      for I := 0 to WinControl.ControlCount - 1 do begin
+        if WinControl.Controls[I] is TControl then begin
+          LoadControl(WinControl.Controls[I]);
+        end;
+      end;
+    end;
+  end;
+end;
+
+procedure TPersistentForm.SaveControl(Control: TControl);
+var
+  I: Integer;
+  WinControl: TWinControl;
+begin
+  if Control is TListView then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      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 TWinControl then begin
+      WinControl := TWinControl(Control);
+      if WinControl.ControlCount > 0 then begin
+        for I := 0 to WinControl.ControlCount - 1 do begin
+          if WinControl.Controls[I] is TControl then begin
+            SaveControl(WinControl.Controls[I]);
+          end;
+        end;
+      end;
+    end;
+end;
+
+procedure TPersistentForm.LoadFromRegistry(RegistryContext: TRegistryContext);
+begin
+  with TRegistryEx.Create do
+  try
+    RootKey := RegistryContext.RootKey;
+    OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
+    // Normal size
+    FormNormalSize.Left := ReadIntegerWithDefault('NormalLeft', FormNormalSize.Left);
+    FormNormalSize.Top := ReadIntegerWithDefault('NormalTop', FormNormalSize.Top);
+    FormNormalSize.Right := ReadIntegerWithDefault('NormalWidth', FormNormalSize.Right - FormNormalSize.Left)
+      + FormNormalSize.Left;
+    FormNormalSize.Bottom := ReadIntegerWithDefault('NormalHeight', FormNormalSize.Bottom - FormNormalSize.Top)
+      + FormNormalSize.Top;
+    // Restored size
+    FormRestoredSize.Left := ReadIntegerWithDefault('RestoredLeft', FormRestoredSize.Left);
+    FormRestoredSize.Top := ReadIntegerWithDefault('RestoredTop', FormRestoredSize.Top);
+    FormRestoredSize.Right := ReadIntegerWithDefault('RestoredWidth', FormRestoredSize.Right - FormRestoredSize.Left)
+      + FormRestoredSize.Left;
+    FormRestoredSize.Bottom := ReadIntegerWithDefault('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top)
+      + FormRestoredSize.Top;
+    // Other state
+    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
+  finally
+    Free;
+  end;
+end;
+
+procedure TPersistentForm.SaveToRegistry(RegistryContext: TRegistryContext);
+begin
+  with Form, TRegistryEx.Create do
+  try
+    RootKey := RegistryContext.RootKey;
+    OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
+    // Normal state
+    WriteInteger('NormalWidth', FormNormalSize.Right - FormNormalSize.Left);
+    WriteInteger('NormalHeight', FormNormalSize.Bottom - FormNormalSize.Top);
+    WriteInteger('NormalTop', FormNormalSize.Top);
+    WriteInteger('NormalLeft', FormNormalSize.Left);
+    // Restored state
+    WriteInteger('RestoredWidth', FormRestoredSize.Right - FormRestoredSize.Left);
+    WriteInteger('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top);
+    WriteInteger('RestoredTop', FormRestoredSize.Top);
+    WriteInteger('RestoredLeft', FormRestoredSize.Left);
+    // Other state
+    WriteInteger('WindowState', Integer(FormWindowState));
+  finally
+    Free;
+  end;
+end;
+
 function TPersistentForm.CheckEntireVisible(Rect: TRect): TRect;
 var
@@ -98 +218 @@
 procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
 var
-  Normal: TRect;
-  Restored: TRect;
   LoadDefaults: Boolean;
 begin
-  with TRegistryEx.Create do
-    try
-      RootKey := RegistryContext.RootKey;
-      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
-
-      //RestoredWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(Form.WindowState)));
-      //if RestoredWindowState = wsMinimized then
-      //  RestoredWindowState := wsNormal;
-      //Form.WindowState := RestoredWindowState;
-      LoadDefaults := not ValueExists('NormalLeft');
-      Normal := Bounds(ReadIntegerWithDefault('NormalLeft', (Screen.Width - Form.Width) div 2),
-        ReadIntegerWithDefault('NormalTop', (Screen.Height - Form.Height) div 2),
-        ReadIntegerWithDefault('NormalWidth', Form.Width),
-        ReadIntegerWithDefault('NormalHeight', Form.Height));
-      Restored := Bounds(ReadIntegerWithDefault('RestoredLeft', (Screen.Width - Form.Width) div 2),
-        ReadIntegerWithDefault('RestoredTop', (Screen.Height - Form.Height) div 2),
-        ReadIntegerWithDefault('RestoredWidth', Form.Width),
-        ReadIntegerWithDefault('RestoredHeight', Form.Height));
-
-      if not EqualRect(Normal, Restored) or
-        (LoadDefaults and DefaultMaximized) then begin
-        // Restore to maximized state
-        Form.WindowState := wsNormal;
-        if not EqualRect(Restored, Form.BoundsRect) then
-          Form.BoundsRect := Restored;
-        Form.WindowState := wsMaximized;
-      end else begin
-        // Restore to normal state
-        Form.WindowState := wsNormal;
-        if FEntireVisible then Normal := CheckEntireVisible(Normal)
-          else if FMinVisiblePart > 0 then
-        Normal := CheckPartVisible(Normal, FMinVisiblePart);
-        if not EqualRect(Normal, Form.BoundsRect) then
-          Form.BoundsRect := Normal;
-      end;
-
-      //if ReadBoolWithDefault('Visible', False) then Form.Show;
-    finally
-      Free;
-    end;
+  Self.Form := Form;
+  // Set default
+  FormNormalSize := Bounds((Screen.Width - Form.Width) div 2,
+    (Screen.Height - Form.Height) div 2, Form.Width, Form.Height);
+  FormRestoredSize := Bounds((Screen.Width - Form.Width) div 2,
+    (Screen.Height - Form.Height) div 2, Form.Width, Form.Height);
+
+  LoadFromRegistry(RegistryContext);
+
+  if not EqualRect(FormNormalSize, FormRestoredSize) or
+    (LoadDefaults and DefaultMaximized) then begin
+    // Restore to maximized state
+    Form.WindowState := wsNormal;
+    if not EqualRect(FormRestoredSize, Form.BoundsRect) then
+      Form.BoundsRect := FormRestoredSize;
+    Form.WindowState := wsMaximized;
+  end else begin
+    // Restore to normal state
+    Form.WindowState := wsNormal;
+    if FEntireVisible then FormNormalSize := CheckEntireVisible(FormNormalSize)
+      else if FMinVisiblePart > 0 then
+    FormNormalSize := CheckPartVisible(FormNormalSize, FMinVisiblePart);
+    if not EqualRect(FormNormalSize, Form.BoundsRect) then
+      Form.BoundsRect := FormNormalSize;
+  end;
+  LoadControl(Form);
 end;
 
 procedure TPersistentForm.Save(Form: TForm);
 begin
-  with Form, TRegistryEx.Create do
-    try
-      RootKey := RegistryContext.RootKey;
-      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
-      WriteInteger('NormalWidth', Form.Width);
-      WriteInteger('NormalHeight', Form.Height);
-      WriteInteger('NormalTop', Form.Top);
-      WriteInteger('NormalLeft', Form.Left);
-      WriteInteger('RestoredWidth', Form.RestoredWidth);
-      WriteInteger('RestoredHeight', Form.RestoredHeight);
-      WriteInteger('RestoredTop', Form.RestoredTop);
-      WriteInteger('RestoredLeft', Form.RestoredLeft);
-      //WriteInteger('WindowState', Integer(Form.WindowState));
-      //WriteBool('Visible', Form.Visible);
-    finally
-      Free;
-    end;
+  Self.Form := Form;
+  FormNormalSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
+  FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+    Form.RestoredHeight);
+  FormWindowState := Form.WindowState;
+  SaveToRegistry(RegistryContext);
+  SaveControl(Form);
 end;
 
@@ -168 +262 @@
 begin
   inherited;
+  if AOwner is TForm then Form := TForm(AOwner)
+    else Form := nil;
   FMinVisiblePart := 50;
   FRegistryContext.RootKey := HKEY_CURRENT_USER;