Changeset 132 for trunk/Forms/UFormMain.pas

Timestamp:

Jun 19, 2017, 10:06:50 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Some application states were not stored/restored correctly after application restart.
• Fixed: Default maximized form state for PersistentForm.
• Fixed: Do not scale up maximized forms according DPI settings.

File:

• trunk/Forms/UFormMain.pas (modified) (4 diffs)

trunk/Forms/UFormMain.pas

@@ -75 +75 @@
     procedure AZoomInExecute(Sender: TObject);
     procedure AZoomOutExecute(Sender: TObject);
-    procedure FormActivate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -242 +241 @@
 end;
 
-procedure TFormMain.FormActivate(Sender: TObject);
-begin
-  if not Core.Initialized then begin
-    Core.Init;
-  end;
-end;
-
 procedure TFormMain.AZoomAllExecute(Sender: TObject);
 var
@@ -313 +305 @@
 begin
   Core.Game.Running := False;
+  Core.PersistentForm.Save(Self);
   SaveConfig(Core.XMLConfig1, 'FormMain');
-  Core.PersistentForm.Save(Self);
+  Core.XMLConfig1.Flush;
 end;
 
@@ -334 +327 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  Core.XMLConfig1.Filename := 'Config.xml';
+  Core.Init;
   LoadConfig(Core.XMLConfig1, 'FormMain');
-  Core.PersistentForm.Load(Self, True);
+  Core.PersistentForm.Load(Self, wsMaximized);
   ReloadView;
   Redraw;