Changeset 145 for trunk/Packages/Common/PersistentForm.pas

Timestamp:

Jun 5, 2023, 6:44:57 PM (18 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/Packages/Common/PersistentForm.pas (moved) (moved from trunk/Packages/Common/UPersistentForm.pas ) (12 diffs)

trunk/Packages/Common/PersistentForm.pas

@@ -1 @@
-unit UPersistentForm;
-
-// Date: 2020-11-26
+unit PersistentForm;
 
 interface
 
 uses
-  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls,
+  Classes, SysUtils, Forms, RegistryEx, LCLIntf, Registry, Controls, ComCtrls,
   ExtCtrls, LCLType;
 
@@ -21 +19 @@
     procedure SaveControl(Control: TControl);
   public
-    FormNormalSize: TRect;
     FormRestoredSize: TRect;
     FormWindowState: TWindowState;
@@ -155 +152 @@
     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);
@@ -169 +160 @@
     FormRestoredSize.Bottom := ReadIntegerWithDefault('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top)
       + FormRestoredSize.Top;
+
     // Other state
     FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(FormWindowState)));
@@ -183 +175 @@
     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
+
+    // Restored size
     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));
@@ -257 +246 @@
 begin
   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);
@@ -267 +255 @@
   LoadFromRegistry(RegistryContext);
 
-  if not EqualRect(FormNormalSize, FormRestoredSize) or
-    DefaultMaximized then begin
+  if (FormWindowState = wsMaximized) or DefaultMaximized then begin
     // Restore to maximized state
     Form.WindowState := wsNormal;
@@ -277 +264 @@
     // Restore to normal state
     Form.WindowState := wsNormal;
-    if FEntireVisible then FormNormalSize := CheckEntireVisible(FormNormalSize)
+    if FEntireVisible then FormRestoredSize := CheckEntireVisible(FormRestoredSize)
       else if FMinVisiblePart > 0 then
-    FormNormalSize := CheckPartVisible(FormNormalSize, FMinVisiblePart);
-    if not EqualRect(FormNormalSize, Form.BoundsRect) then
-      Form.BoundsRect := FormNormalSize;
+        FormRestoredSize := CheckPartVisible(FormRestoredSize, FMinVisiblePart);
+    if not EqualRect(FormRestoredSize, Form.BoundsRect) then
+      Form.BoundsRect := FormRestoredSize;
   end;
   if FormFullScreen then SetFullScreen(True);
@@ -290 +277 @@
 begin
   Self.Form := Form;
-  FormNormalSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
-  if not FormFullScreen then
-    FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
-      Form.RestoredHeight);
-  FormWindowState := Form.WindowState;
+  if not FormFullScreen then begin
+    FormWindowState := Form.WindowState;
+    if FormWindowState = wsMaximized then begin
+      FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+        Form.RestoredHeight);
+    end else
+    if FormWindowState = wsNormal then begin
+      FormRestoredSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
+    end;
+  end;
   SaveToRegistry(RegistryContext);
   SaveControl(Form);
@@ -312 +304 @@
   if State then begin
     FormFullScreen := True;
-    FormNormalSize := Form.BoundsRect;
-    FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
-      Form.RestoredHeight);
+    if Form.WindowState = wsMaximized then begin
+      FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+        Form.RestoredHeight);
+    end else
+    if Form.WindowState = wsNormal then begin
+      FormRestoredSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
+    end;
     FormWindowState := Form.WindowState;
+    Form.WindowState := wsMaximized;
+    Form.WindowState := wsNormal;
     ShowWindow(Form.Handle, SW_SHOWFULLSCREEN);
     {$IFDEF WINDOWS}
@@ -327 +325 @@
     ShowWindow(Form.Handle, SW_SHOWNORMAL);
     if FormWindowState = wsNormal then begin
-      Form.BoundsRect := FormNormalSize;
+      Form.WindowState := wsNormal;
+      Form.BoundsRect := FormRestoredSize;
     end else
     if FormWindowState = wsMaximized then begin
@@ -337 +336 @@
 
 end.
-