Changeset 132

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.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (4 diffs)
• Forms/UFormMain.pas (modified) (4 diffs)
• Packages/Common/UPersistentForm.pas (modified) (5 diffs)
• UCore.pas (modified) (2 diffs)
• xtactics.lpi (modified) (2 diffs)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 784
+  Left = 577
   Height = 621
-  Top = 435
+  Top = 309
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 589
+  ClientHeight = 596
   ClientWidth = 775
   Menu = MainMenu1
-  OnActivate = FormActivate
   OnClose = FormClose
   OnCreate = FormCreate
@@ -14 +13 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '1.6.2.0'
   WindowState = wsMaximized
   object StatusBar1: TStatusBar
     Left = 0
     Height = 28
-    Top = 561
+    Top = 568
     Width = 775
     Panels = <    
@@ -35 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 561
+    Height = 568
     Top = 0
     Width = 80
@@ -118 +117 @@
   object PaintBox1: TPaintBox
     Left = 80
-    Height = 561
+    Height = 568
     Top = 0
     Width = 695

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;

trunk/Packages/Common/UPersistentForm.pas

@@ -26 +26 @@
     FormWindowState: TWindowState;
     Form: TForm;
+    DefaultFormWindowState: TWindowState;
     procedure LoadFromRegistry(RegistryContext: TRegistryContext);
     procedure SaveToRegistry(RegistryContext: TRegistryContext);
     function CheckEntireVisible(Rect: TRect): TRect;
     function CheckPartVisible(Rect: TRect; Part: Integer): TRect;
-    procedure Load(Form: TForm; DefaultMaximized: Boolean = False);
+    procedure Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
     procedure Save(Form: TForm);
     constructor Create(AOwner: TComponent); override;
@@ -56 +57 @@
   I: Integer;
   WinControl: TWinControl;
-  Count: Integer;
 begin
   if Control is TListView then begin
@@ -135 +135 @@
       + FormRestoredSize.Top;
     // Other state
-    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
+    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(DefaultFormWindowState)));
   finally
     Free;
@@ -216 +216 @@
 end;
 
-procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
-var
-  LoadDefaults: Boolean;
+procedure TPersistentForm.Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
 begin
   Self.Form := Form;
+  Self.DefaultFormWindowState := DefaultFormWindowState;
+
   // Set default
   FormNormalSize := Bounds((Screen.Width - Form.Width) div 2,
@@ -230 +230 @@
 
   if not EqualRect(FormNormalSize, FormRestoredSize) or
-    (LoadDefaults and DefaultMaximized) then begin
+    (FormWindowState = wsMaximized) then begin
     // Restore to maximized state
     Form.WindowState := wsNormal;

trunk/UCore.pas

@@ -224 +224 @@
       FormNew.Show;
       FormNew.Hide;
-      for I := 0 to Screen.FormCount - 1 do begin
+      for I := 0 to Screen.FormCount - 1 do
+      if (Screen.Forms[I].WindowState = wsNormal) or
+        (Screen.Forms[I].WindowState = wsMinimized) then begin
         StoreDimensions(Screen.Forms[I], StoredDimension);
         ScaleDimensions(Screen.Forms[I], StoredDimension);
@@ -436 +438 @@
 procedure TCore.Init;
 begin
-  {$IFDEF Linux}
-  // If installed in Linux system then use installation directory for po files
-  if Application.ExeName = '/usr/bin/xtactics' then
-    CoolTranslator1.POFilesFolder := '/usr/share/xtactics/languages';
-  {$ENDIF}
-  FInitialized := True;
-
-  LoadConfig;
-  Game.LoadConfig(XMLConfig1, 'Game');
-
-  // Update translated default player names
-  TPlayer(Game.Players[0]).Name := SPlayer + ' 1';
-  TPlayer(Game.Players[1]).Name := SPlayer + ' 2';
-
-  CommandLineParams;
-  ScaleDPI;
-
-  if Game.FileName = '' then StartNewGame;
+  if not Core.Initialized then begin
+    {$IFDEF Linux}
+    // If installed in Linux system then use installation directory for po files
+    if Application.ExeName = '/usr/bin/xtactics' then
+      CoolTranslator1.POFilesFolder := '/usr/share/xtactics/languages';
+    {$ENDIF}
+    FInitialized := True;
+
+    LoadConfig;
+    Game.LoadConfig(XMLConfig1, 'Game');
+
+    // Update translated default player names
+    TPlayer(Game.Players[0]).Name := SPlayer + ' 1';
+    TPlayer(Game.Players[1]).Name := SPlayer + ' 2';
+
+    CommandLineParams;
+    ScaleDPI;
+
+    if Game.FileName = '' then StartNewGame;
+  end;
 end;
 

trunk/xtactics.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="9"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -279 +279 @@
         <StackChecks Value="True"/>
       </Checks>
-      <VerifyObjMethodCallValidity Value="True"/>
     </CodeGeneration>
     <Linking>