Changeset 327 for trunk

Timestamp:

Jul 16, 2024, 10:58:45 PM (4 months ago)

Author:

chronos

Message:

• Fixed: Keep full screen info on single place.

Location:

trunk

Files:

• Core.pas (modified) (5 diffs)
• Forms/FormMain.pas (modified) (4 diffs)

trunk/Core.pas

@@ -71 +71 @@
     GameLoaded: Boolean;
     FormNewTabIndex: Integer;
-    FullScreen: Boolean;
     GameFilesDir: string;
     procedure LoadRecentExecute(Sender: TObject);
@@ -87 +86 @@
     procedure FormClientActions;
     procedure LoadGameSystems;
-    procedure ToggleFullscreen;
   public
     Game: TGame;
@@ -294 +292 @@
 procedure TCore.UpdateInterface;
 begin
-  Core.AGameEnd.Enabled := Core.Game.Running;
+  Core.AGameEnd.Enabled := Game.Running;
+  Core.AFullscreen.Checked := FormMain.FullScreen;
 end;
 
@@ -306 +305 @@
 procedure TCore.AFullscreenExecute(Sender: TObject);
 begin
-  ToggleFullscreen;
+  FormMain.ToggleFullscreen;
+  UpdateInterface;
 end;
 
@@ -657 +657 @@
 end;
 
-procedure TCore.ToggleFullscreen;
-begin
-  FullScreen := not FullScreen;
-  PersistentForm1.Form := FormMain;
-  PersistentForm1.SetFullScreen(FullScreen);
-  UpdateInterface;
-end;
-
 procedure TCore.ReopenGameOnInit;
 begin

trunk/Forms/FormMain.pas

@@ -90 +90 @@
     FormActivated: Boolean;
     FormShown: Boolean;
-    FullScreen: Boolean;
     procedure ApplicationStart(Ptr: IntPtr);
     procedure UpdateClientForms;
@@ -99 +98 @@
     FormUnitMoves: TFormUnitMoves;
     FormCharts: TFormCharts;
+    FullScreen: Boolean;
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
     procedure ReloadView;
+    procedure ToggleFullscreen;
   end;
 
@@ -167 +168 @@
   end;
   ToolBar1.Visible := AToolBarVisible.Checked;
+end;
+
+procedure TFormMain.ToggleFullscreen;
+begin
+  FullScreen := not FullScreen;
+  TFormEx.PersistentForm.Form := Self;
+  TFormEx.PersistentForm.SetFullScreen(FullScreen);
 end;
 
@@ -287 +295 @@
     AUnitShapeVisible.Checked := Core.Core.UnitShapeVisible;
     Core.Core.ScaleDPI;
+    Core.Core.PersistentForm1.Load(Self);
     FullScreen := Core.Core.PersistentForm1.FormFullScreen;
     Core.Core.Init;