Changeset 107 for trunk/Forms/FormMain.pas

Timestamp:

Jul 19, 2024, 11:24:06 PM (2 months ago)

Author:

chronos

Message:

• Fixed: Full screen mode switching on Windows.
• Modified: Updated Common package.

File:

• trunk/Forms/FormMain.pas (modified) (9 diffs)

trunk/Forms/FormMain.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, LCLType,
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, LCLType, FormEx,
   Dialogs, ExtCtrls, ComCtrls, Menus, ActnList, Engine, Platform, Math,
   DateUtils, GraphType, PersistentForm, ApplicationInfo, Translator,
@@ -13 +13 @@
   { TFormMain }
 
-  TFormMain = class(TForm)
+  TFormMain = class(TFormEx)
     AAbout: TAction;
     AShowRawImageDesc: TAction;
@@ -41 +41 @@
     procedure AShowMapExecute(Sender: TObject);
     procedure AShowRawImageDescExecute(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -53 +52 @@
     StartTime: TDateTime;
     Drawing: Boolean;
-    FullScreenEnabled: Boolean;
     procedure LoadConfig;
     procedure SaveConfig;
     procedure UpdateInterface;
   public
-    PersistentForm: TPersistentForm;
     Engine: TEngine;
     FormNewGame: TFormNewGame;
@@ -145 +142 @@
 begin
   {$IFDEF LCLQT5}
-  MenuItem1.Visible := not FullScreenEnabled;
-  MenuItem4.Visible := not FullScreenEnabled;
-  MenuItem7.Visible := not FullScreenEnabled;
+  MenuItem1.Visible := not FullScreen;
+  MenuItem4.Visible := not FullScreen;
+  MenuItem7.Visible := not FullScreen;
   {$ELSE}
-  if FullScreenEnabled then Menu := nil
+  if FullScreen then Menu := nil
     else Menu := MainMenu1;
   {$ENDIF}
   {$IFDEF DEBUG}
-  StatusBar1.Visible := not FullScreenEnabled;
+  StatusBar1.Visible := not FullScreen;
   AShowMap.Visible := True;
   ANewGame.Visible := True;
@@ -178 +175 @@
 
   Image1.ControlStyle := Image1.ControlStyle + [csOpaque];
-  FullScreenEnabled := True;
-
-  PersistentForm := TPersistentForm.Create(nil);
-  PersistentForm.RegistryContext := TRegistryContext.Create(Core.Core.ApplicationInfo.RegistryRoot,
-    Core.Core.ApplicationInfo.RegistryKey);
+  FullScreen := True;
 
   Application.OnDeactivate := FormDeactivate;
@@ -214 +207 @@
 procedure TFormMain.AFullScreenExecute(Sender: TObject);
 begin
-  FullScreenEnabled := not FullScreenEnabled;
-  PersistentForm.SetFullScreen(FullScreenEnabled);
+  FullScreen := not FullScreen;
+  TFormEx.PersistentForm.Load(Self);
+  TFormEx.PersistentForm.SetFullScreen(FullScreen);
   UpdateInterface;
 end;
@@ -244 +238 @@
 end;
 
-procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  PersistentForm.Save(Self);
-end;
-
 procedure TFormMain.AExitExecute(Sender: TObject);
 begin
@@ -282 +271 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  PersistentForm.RegistryContext := Core.Core.ApplicationInfo.GetRegistryContext;
-  PersistentForm.Load(Self, False, True);
-  FullScreenEnabled := PersistentForm.FormFullScreen;
-  //PersistentForm.SetFullScreen(FullScreenEnabled);
   UpdateInterface;
 end;