Changeset 69

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (3 diffs)
• Packages/Common/UPersistentForm.pas (modified) (2 diffs)

trunk/Forms/UFormMain.pas

@@ -73 +73 @@
 procedure TFormMain.FormActivate(Sender: TObject);
 begin
+end;
+
+procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  PersistentForm1.Save(Self);
+end;
+
+procedure TFormMain.FormDestroy(Sender: TObject);
+begin
+  SaveConfig;
+  Engine.Free;
+end;
+
+procedure TFormMain.FormKeyPress(Sender: TObject; var Key: char);
+begin
+  if Key = #32 then begin
+    if Engine.State = gsRunning then Engine.State := gsPaused
+    else if Engine.State = gsPaused then Engine.State := gsRunning;
+  end;
+end;
+
+procedure TFormMain.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
+  );
+const
+  KeyF11 = 122;
+begin
+  if Key = KeyF11 then begin
+    FullScreen := not FullScreen;
+    PersistentForm1.SetFullScreen(FormMain.FullScreen);
+  end else
+    Engine.KeyUp(Key);
+end;
+
+procedure TFormMain.FormShow(Sender: TObject);
+begin
   if not Initialized then begin
     Initialized := True;
@@ -78 +113 @@
     PersistentForm1.Load(Self, False, True);
     FullScreen := PersistentForm1.FormFullScreen;
-    Randomize;
     Engine.InitMenus;
     Engine.ImagePassenger.Picture.Assign(FormImages.ImagePassenger.Picture);
@@ -86 +120 @@
     Engine.MainMenu;
   end;
-end;
-
-procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  PersistentForm1.Save(Self);
-end;
-
-procedure TFormMain.FormDestroy(Sender: TObject);
-begin
-  SaveConfig;
-  Engine.Free;
-end;
-
-procedure TFormMain.FormKeyPress(Sender: TObject; var Key: char);
-begin
-  if Key = #32 then begin
-    if Engine.State = gsRunning then Engine.State := gsPaused
-    else if Engine.State = gsPaused then Engine.State := gsRunning;
-  end;
-end;
-
-procedure TFormMain.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
-  );
-const
-  KeyF11 = 122;
-begin
-  if Key = KeyF11 then begin
-    FullScreen := not FullScreen;
-    PersistentForm1.SetFullScreen(FormMain.FullScreen);
-  end else
-    Engine.KeyUp(Key);
-end;
-
-procedure TFormMain.FormShow(Sender: TObject);
-begin
 end;
 

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;