Changeset 328

Timestamp:

Jul 19, 2024, 8:40:00 PM (7 weeks ago)

Author:

chronos

Message:

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

Location:

trunk

Files:

• Core.lfm (modified) (1 diff)
• Core.pas (modified) (5 diffs)
• Forms/FormMain.pas (modified) (2 diffs)
• Packages/Common/Common.pas (modified) (2 diffs)
• Packages/Common/FormEx.pas (modified) (4 diffs)
• Packages/Common/JobProgressView.pas (modified) (1 diff)
• Packages/Common/PersistentForm.pas (modified) (4 diffs)
• xtactics.lpr (modified) (2 diffs)

trunk/Core.lfm

@@ -1315 +1315 @@
     AppName = 'xTactics'
     Description = 'A turn-based strategy game inspired by classic Risk board game. The game is highly configurable to allow to adjust battle field and game rules.'
-    ReleaseDate = 44579
-    RegistryKey = '\Software\xTactics'
+    ReleaseDate = 45468
+    RegistryKey = '\Software\Chronosoft\xTactics'
     RegistryRoot = rrKeyCurrentUser
     License = 'CC0'

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;
 

trunk/Forms/FormMain.pas

@@ -98 +98 @@
     FormUnitMoves: TFormUnitMoves;
     FormCharts: TFormCharts;
-    FullScreen: Boolean;
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
@@ -249 +248 @@
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
+  if Assigned(FormPlayersStats) then FreeAndNil(FormPlayersStats);
+  if Assigned(FormUnitMoves) then FreeAndNil(FormUnitMoves);
+  if Assigned(FormCharts) then FreeAndNil(FormCharts);
+  if Assigned(FormKeyShortcuts) then FreeAndNil(FormKeyShortcuts);
   FreeAndNil(FormClient);
 end;

trunk/Packages/Common/Common.pas

@@ -53 +53 @@
 function ComputerName: string;
 procedure DeleteFiles(APath, AFileSpec: string);
+function EndsWith(Text, What: string): Boolean;
 function Explode(Separator: Char; Data: string): TStringArray;
 procedure ExecuteProgram(Executable: string; Parameters: array of string);
@@ -87 +88 @@
 procedure SearchFiles(AList: TStrings; Dir: string;
   FilterMethod: TFilterMethod = nil; FileNameMethod: TFileNameMethod = nil);
+procedure SortStrings(Strings: TStrings);
 function SplitString(var Text: string; Count: Word): string;
 function StripTags(const S: string): string;
+function StartsWith(Text, What: string): Boolean;
 function TryHexToInt(Data: string; out Value: Integer): Boolean;
 function TryBinToInt(Data: string; out Value: Integer): Boolean;
-procedure SortStrings(Strings: TStrings);
 
 
 implementation
+
+function StartsWith(Text, What: string): Boolean;
+begin
+  Result := Copy(Text, 1, Length(Text)) = What;
+end;
+
+function EndsWith(Text, What: string): Boolean;
+begin
+  Result := Copy(Text, Length(Text) - Length(What) + 1, MaxInt) = What;
+end;
 
 function BinToInt(BinStr : string) : Int64;

trunk/Packages/Common/FormEx.pas

@@ -13 +13 @@
   private
     FCounter: Integer; static;
+    FFirstShow: Boolean;
   protected
     procedure DoShow; override;
@@ -19 +20 @@
     procedure DoDestroy; override;
   public
+    FullScreen: Boolean;
     PersistentForm: TPersistentForm; static;
     ThemeManager: TThemeManager; static;
@@ -44 +46 @@
 begin
   inherited;
-  PersistentForm.Load(Self);
+  if not FFirstShow and (not (csDesigning in ComponentState)) then begin
+    FFirstShow := True;
+    PersistentForm.Load(Self);
+    FullScreen := PersistentForm.FormFullScreen;
+  end;
 end;
 
@@ -76 +82 @@
 procedure TFormEx.DoClose(var CloseAction: TCloseAction);
 begin
-  PersistentForm.Save(Self);
+  if  (not (csDesigning in ComponentState)) then begin
+    PersistentForm.FormFullScreen := FullScreen;
+    PersistentForm.Save(Self);
+  end;
   inherited;
 end;

trunk/Packages/Common/JobProgressView.pas

@@ -339 +339 @@
   Caption := SPleaseWait + STerminate;
 end;
+
 
 { TJobProgressView }

trunk/Packages/Common/PersistentForm.pas

@@ -16 +16 @@
     FMinVisiblePart: Integer;
     FRegistryContext: TRegistryContext;
+    FResizeEventOccured: Boolean;
     procedure LoadControl(Control: TControl);
     procedure SaveControl(Control: TControl);
+    procedure WindowStateChange(Sender: TObject);
   public
     FormRestoredSize: TRect;
@@ -301 +303 @@
 
 procedure TPersistentForm.SetFullScreen(State: Boolean);
+{$IFDEF UNIX}
+var
+  OldHandler: TNotifyEvent;
+var
+  I: Integer;
+{$ENDIF}
 begin
   if State then begin
@@ -312 +320 @@
     end;
     FormWindowState := Form.WindowState;
-    Form.WindowState := wsMaximized;
-    Form.WindowState := wsNormal;
-    ShowWindow(Form.Handle, SW_SHOWFULLSCREEN);
     {$IFDEF WINDOWS}
     Form.BorderStyle := bsNone;
     {$ENDIF}
+    Form.WindowState := wsFullscreen;
+    {$IFDEF UNIX}
+    // Workaround on Linux, WindowState is rewriten by WMSize event to wsNormal.
+    // We need for that even to occure
+    OldHandler := Form.OnWindowStateChange;
+    Form.OnWindowStateChange := WindowStateChange;
+    FResizeEventOccured := False;
+    for I := 0 to 10 do begin
+      if FResizeEventOccured then Break;
+      Application.ProcessMessages;
+      Sleep(1);
+    end;
+    Form.OnWindowStateChange := OldHandler;
+    {$ENDIF}
   end else begin
     FormFullScreen := False;
+    Form.WindowState := wsNormal;
     {$IFDEF WINDOWS}
     Form.BorderStyle := bsSizeable;
     {$ENDIF}
-    ShowWindow(Form.Handle, SW_SHOWNORMAL);
     if FormWindowState = wsNormal then begin
       Form.WindowState := wsNormal;
@@ -335 +354 @@
 end;
 
+procedure TPersistentForm.WindowStateChange(Sender: TObject);
+begin
+  Form.WindowState := wsFullscreen;
+  FResizeEventOccured := True;
+end;
+
 end.

trunk/xtactics.lpr

@@ -1 +1 @@
 program xtactics;
-
-{$mode objfpc}{$H+}
 
 uses
@@ -8 +6 @@
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, tachartlazaruspkg, Game, Core, Common,
-  TemplateGenerics
+  Forms, tachartlazaruspkg, Game, Core, Common, TemplateGenerics
   { you can add units after this },
   SysUtils, FormMain, CoolStreaming;