Changeset 580 for trunk/LocalPlayer/Term.pas

Timestamp:

May 23, 2024, 8:19:21 PM (4 months ago)

Author:

chronos

Message:

• Fixed: Task bar shouldn't be visible in full screen mode on Windows.

File:

• trunk/LocalPlayer/Term.pas (modified) (4 diffs)

trunk/LocalPlayer/Term.pas

@@ -324 +324 @@
     HaveStrategyAdvice: Boolean;
     FirstMovieTurn: Boolean;
-    PrevWindowState: TWindowState;
-    CurrentWindowState: TWindowState;
+    FormFullScreen: Boolean;
+    FormRestoredSize: TRect;
+    FormWindowState: TWindowState;
     MainMap: TIsoMap;
     NoMap: TIsoMap;
@@ -7023 +7024 @@
 
 procedure TMainScreen.SetFullScreen(Active: Boolean);
-begin
-  if Active and (CurrentWindowState <> TWindowState.wsFullScreen) then begin
-    PrevWindowState := WindowState;
-    CurrentWindowState := TWindowState.wsFullScreen;
-    WindowState := CurrentWindowState;
+var
+  Form: TForm;
+begin
+  Form := Self;
+  if Active then begin
+    FormFullScreen := True;
+    if Form.WindowState = TWindowState.wsMaximized then begin
+      FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+        Form.RestoredHeight);
+    end else
+    if Form.WindowState = TWindowState.wsNormal then begin
+      FormRestoredSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
+    end;
+    FormWindowState := Form.WindowState;
+    Form.WindowState := TWindowState.wsMaximized;
+    Form.WindowState := TWindowState.wsNormal;
+    ShowWindow(Form.Handle, SW_SHOWFULLSCREEN);
     {$IFDEF WINDOWS}
-    BorderStyle := TBorderStyle.bsNone;
+    Form.BorderStyle := TBorderStyle.bsNone;
     {$ENDIF}
-    BorderIcons := [];
-  end else
-  if not Active and (CurrentWindowState = TWindowState.wsFullScreen) then begin
-    if PrevWindowState = TWindowState.wsMaximized then begin
-      CurrentWindowState := TWindowState.wsNormal;
-      WindowState := CurrentWindowState;
-    end else begin
-      CurrentWindowState := PrevWindowState;
-      WindowState := CurrentWindowState;
-      WindowState := TWindowState.wsFullScreen;
-      WindowState := CurrentWindowState;
-    end;
+  end else begin
+    FormFullScreen := False;
     {$IFDEF WINDOWS}
-    BorderStyle := TBorderStyle.bsSizeable;
+    Form.BorderStyle := TBorderStyle.bsSizeable;
     {$ENDIF}
-    BorderIcons := [TBorderIcon.biSystemMenu, TBorderIcon.biMinimize,
-      TBorderIcon.biMaximize];
-    if Left < 0 then Left := 0;
-    if Top < 0 then Top := 0;
+    ShowWindow(Form.Handle, SW_SHOWNORMAL);
+    if FormWindowState = TWindowState.wsNormal then begin
+      Form.WindowState := TWindowState.wsNormal;
+      Form.BoundsRect := FormRestoredSize;
+    end else
+    if FormWindowState = TWindowState.wsMaximized then begin
+      Form.BoundsRect := FormRestoredSize;
+      Form.WindowState := TWindowState.wsMaximized;
+    end;
   end;
 end;
@@ -8058 +8066 @@
   if FullScreen then BoundsRect := Bounds(0, 0, Screen.Width, Screen.Height)
     else BoundsRect := TermBounds;
+  FormRestoredSize := TermBounds;
   SetFullScreen(FullScreen);
   FormResize(nil); // place mini map correctly according to its size
@@ -8065 +8074 @@
 procedure TMainScreen.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-  TermBounds := BoundsRect;
+  if FullScreen then TermBounds := FormRestoredSize
+    else TermBounds := BoundsRect;
   Timer1.Enabled := False;
 end;