Changeset 227

Timestamp:

Sep 9, 2018, 11:45:45 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Load and start new game after main form is shown so cells can be correctly zoomed to be visible all.

Location:

trunk

Files:

• Forms/UFormClient.pas (modified) (1 diff)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (5 diffs)
• UCore.pas (modified) (5 diffs)

trunk/Forms/UFormClient.pas

@@ -302 +302 @@
   ToolBar1.Visible := AToolBarVisible.Checked;
   StatusBar1.Visible := AStatusBarVisible.Checked;
-  AGameEndTurn.Enabled := Assigned(Client.ControlPlayer) and
+  AGameEndTurn.Enabled := Assigned(Client) and Assigned(Client.ControlPlayer) and
     Client.ControlPlayer.IsAlive and TurnActive;
-  ASurrender.Enabled := Assigned(Client.ControlPlayer) and
+  ASurrender.Enabled := Assigned(Client) and Assigned(Client.ControlPlayer) and
     Client.ControlPlayer.IsAlive;
 end;

trunk/Forms/UFormMain.lfm

@@ -9 +9 @@
   DesignTimePPI = 144
   Menu = MainMenu1
+  OnActivate = FormActivate
   OnClose = FormClose
   OnCreate = FormCreate

trunk/Forms/UFormMain.pas

@@ -69 +69 @@
     procedure AToolBarBigIconsExecute(Sender: TObject);
     procedure AToolBarVisibleExecute(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
     procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormShow(Sender: TObject);
@@ -77 +78 @@
     procedure Timer1Timer(Sender: TObject);
   private
+    FormActivated: Boolean;
+    procedure ApplicationStart(Ptr: IntPtr);
   public
     procedure LoadConfig(Config: TXmlConfig; Path: string);
@@ -173 +176 @@
 end;
 
+procedure TFormMain.FormActivate(Sender: TObject);
+begin
+  if not FormActivated then begin
+    FormActivated := True;
+  end;
+end;
+
 procedure TFormMain.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
   );
@@ -191 +201 @@
 begin
   FormClient.Free;
+end;
+
+procedure TFormMain.ApplicationStart(Ptr: IntPtr);
+begin
+  Core.ReopenGameOnInit;
 end;
 
@@ -202 +217 @@
   ReloadView;
   FormClient.Show;
+  Application.QueueAsyncCall(ApplicationStart, 0);
 end;
 

trunk/UCore.pas

@@ -94 +94 @@
     LocalClients: TClients;
     ServerList: TServerList;
+    procedure ReopenGameOnInit;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -490 +491 @@
   SelectClient;
   LastOpenedList1.AddItem(FileName);
-  FormClient.AZoomAll.Execute;
   UpdateOtherForms;
   UpdateInterface;
@@ -496 +496 @@
   if Assigned(ServerClient) then ServerClient.TurnStart
     else raise Exception.Create(SMissingServerClientForPlayer);
+  FormClient.AZoomAll.Execute;
 end;
 
@@ -515 +516 @@
     Action.Assign(TAction(FormClient.ActionList1.Actions[I]));
     Action.ActionList := FormMain.ActionList1;
+  end;
+end;
+
+procedure TCore.ReopenGameOnInit;
+begin
+  CommandLineParams;
+  if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) and
+    FileExists(LastOpenedList1.Items[0]) then
+    LoadGame(LastOpenedList1.Items[0]);
+
+  if Game.FileName = '' then begin
+    Game.Assign(GameSettings);
+    StartNewGame;
   end;
 end;
@@ -626 +640 @@
     ServerList.LoadConfig(XmlConfig1, 'ServerList');
 
-    CommandLineParams;
-    if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) and
-      FileExists(LastOpenedList1.Items[0]) then
-      LoadGame(LastOpenedList1.Items[0]);
     FormClientActions;
-
-    if Game.FileName = '' then begin
-      Game.Assign(GameSettings);
-      StartNewGame;
-    end;
   end;
 end;