Changeset 328 for trunk/Core.pas

Timestamp:

Jul 19, 2024, 8:40:00 PM (2 months ago)

Author:

chronos

Message:

• Fixed: Full screen switching on Windows.
• Fixed: Main form was not visible on Windows task bar.

File:

• trunk/Core.pas (modified) (5 diffs)

trunk/Core.pas

@@ -7 +7 @@
   Game, ApplicationInfo, PersistentForm, ScaleDPI, Translator, DOM,
   RegistryEx, LastOpenedList, Theme, Registry, Menus, FormCharts, FormMain,
-  FormClient, Player, GameServer, GameClient, Generics.Collections,
-  ServerList, GameSystem, Graphics, &Unit;
+  FormClient, Player, GameServer, GameClient, ServerList, GameSystem, Graphics,
+  &Unit;
 
 type
@@ -486 +486 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
+{$IFDEF Linux}
 const
   LinuxGameFilesDir = '/usr/share/xtactics';
   LinuxLanguagesDir = LinuxGameFilesDir + '/Languages';
+{$ENDIF}
 begin
   GameFilesDir := '';
@@ -526 +528 @@
   TFormEx.PersistentForm := PersistentForm1;
 
-  FormMain := TFormMain.Create(nil);
+  Application.CreateForm(TFormMain, FormMain);
   FormMain.Show;
 end;
@@ -533 +535 @@
 begin
   FreeAndNil(ServerList);
-  if Assigned(FormMain.FormPlayersStats) then FreeAndNil(FormMain.FormPlayersStats);
-  if Assigned(FormMain.FormUnitMoves) then FreeAndNil(FormMain.FormUnitMoves);
-  if Assigned(FormMain.FormCharts) then FreeAndNil(FormMain.FormCharts);
-  if Assigned(FormMain.FormKeyShortcuts) then FreeAndNil(FormMain.FormKeyShortcuts);
   FreeAndNil(FormClients);
   FreeAndNil(StoredDimension);
@@ -544 +542 @@
   FreeAndNil(GameSettings);
   FreeAndNil(GameSystems);
-  FreeAndNil(FormMain);
 end;