Changeset 69 for trunk/Packages

Timestamp:

Nov 28, 2020, 12:35:06 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Restore from fulscreen mode to maximized state not retaining normal state dimensions.

File:

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

trunk/Packages/Common/UPersistentForm.pas

@@ -314 +314 @@
   if State then begin
     FormFullScreen := True;
+    FormNormalSize := Form.BoundsRect;
     FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
       Form.RestoredHeight);
+    FormWindowState := Form.WindowState;
     ShowWindow(Form.Handle, SW_SHOWFULLSCREEN);
     {$IFDEF WINDOWS}
@@ -322 +324 @@
   end else begin
     FormFullScreen := False;
-    if Form.WindowState = wsNormal then begin
-      ShowWindow(Form.Handle, SW_SHOWNORMAL);
-      //Form.BoundsRect := FormRestoredSize;
-    end else if Form.WindowState = wsMaximized then ShowWindow(Form.Handle, SW_SHOWMAXIMIZED);
     {$IFDEF WINDOWS}
     Form.BorderStyle := bsSizeable;
     {$ENDIF}
+    ShowWindow(Form.Handle, SW_SHOWNORMAL);
+    if FormWindowState = wsNormal then begin
+      Form.BoundsRect := FormNormalSize;
+    end else
+    if FormWindowState = wsMaximized then begin
+      Form.BoundsRect := FormRestoredSize;
+      Form.WindowState := wsMaximized;
+    end;
   end;
 end;