Changeset 81 for trunk/Packages/Common

Timestamp:

Jun 21, 2017, 4:02:31 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Show main form as maximized by default on first start.

File:

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

trunk/Packages/Common/UPersistentForm.pas

@@ -26 +26 @@
     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; DefaultMaximized: Boolean = False);
+    procedure Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
     procedure Save(Form: TForm);
     constructor Create(AOwner: TComponent); override;
@@ -56 +57 @@
   I: Integer;
   WinControl: TWinControl;
-  Count: Integer;
 begin
   if Control is TListView then begin
@@ -135 +135 @@
       + FormRestoredSize.Top;
     // Other state
-    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
+    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(DefaultFormWindowState)));
   finally
     Free;
@@ -216 +216 @@
 end;
 
-procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
-var
-  LoadDefaults: Boolean;
+procedure TPersistentForm.Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
 begin
   Self.Form := Form;
+  Self.DefaultFormWindowState := DefaultFormWindowState;
+
   // Set default
   FormNormalSize := Bounds((Screen.Width - Form.Width) div 2,
@@ -230 +230 @@
 
   if not EqualRect(FormNormalSize, FormRestoredSize) or
-    (LoadDefaults and DefaultMaximized) then begin
+    (FormWindowState = wsMaximized) then begin
     // Restore to maximized state
     Form.WindowState := wsNormal;