Changeset 86 for trunk/Forms/FormMain.pas

Timestamp:

Jun 7, 2024, 12:47:11 PM (3 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Used TFormEx for all forms for code simplification.
• Fixed: Fullscreen mode switching error.

File:

• trunk/Forms/FormMain.pas (moved) (moved from trunk/Forms/UFormMain.pas ) (12 diffs)

trunk/Forms/FormMain.pas

@@ -1 @@
-unit UFormMain;
-
-{$mode delphi}{$H+}
+unit FormMain;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus, Math,
-  ActnList, ExtCtrls, StdCtrls, UGame, PersistentForm, ApplicationInfo,
-  LCLType, Syncobjs, DateUtils;
+  ActnList, ExtCtrls, StdCtrls, Game, PersistentForm, ApplicationInfo,
+  LCLType, Syncobjs, DateUtils, FormEx;
 
 type
@@ -22 +20 @@
   { TFormMain }
 
-  TFormMain = class(TForm)
+  TFormMain = class(TFormEx)
     MainMenu1: TMainMenu;
     MenuItem1: TMenuItem;
@@ -72 +70 @@
   FormMain: TFormMain;
 
+
 implementation
 
@@ -77 +76 @@
 
 uses
-  UCore;
+  Core;
 
 { TMoveThread }
@@ -98 +97 @@
   KeyDown = 40;
 begin
-  if Core.Game.Running then begin
+  if Core.Core.Game.Running then begin
     case Key of
       KeyLeft: AddToMoveBuffer(drLeft);
@@ -162 +161 @@
   TimeStart := Now;
   {$ENDIF}
-  Core.Game.Render(Canvas, Point(Width, Height - MainMenu1.Height));
+  Core.Core.Game.Render(Canvas, Point(Width, Height - MainMenu1.Height));
   {$IFDEF DEBUG}
   DrawDuration := Now - TimeStart;
@@ -170 +169 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;
 
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
-  Core.Translator1.TranslateComponentRecursive(Self);
   MoveBufferLock := TCriticalSection.Create;
   MoveThread := TMoveThread.Create(True);
@@ -192 +190 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.RegistryContext := Core.ApplicationInfo1.GetRegistryContext;
-  Core.PersistentForm1.Load(Self);
-  FullScreen := Core.PersistentForm1.FormFullScreen;
-  Core.ThemeManager1.UseTheme(Self);
+  FullScreen := Core.Core.PersistentForm1.FormFullScreen;
+
   UpdateInterface;
-  if Core.Game.Board.GetEmptyTilesCount > Core.Game.Board.Size.X * Core.Game.Board.Size.Y -
+  if Core.Core.Game.Board.GetEmptyTilesCount > Core.Core.Game.Board.Size.X * Core.Core.Game.Board.Size.Y -
     InitialTileCount then
-    Core.Game.New;
+    Core.Core.Game.New;
 end;
 
@@ -236 +232 @@
 procedure TFormMain.ProcessMoveBuffer;
 begin
-  if not Core.Game.Moving then begin
+  if not Core.Core.Game.Moving then begin
     MoveBufferLock.Acquire;
     while Length(MoveBuffer) > 0 do begin
       MoveBufferLock.Release;
-      Core.Game.MoveAllAndUpdate(MoveBuffer[0], Core.Game.AnimationDuration > 0);
+      Core.Core.Game.MoveAllAndUpdate(MoveBuffer[0], Core.Core.Game.AnimationDuration > 0);
       MoveBufferLock.Acquire;
       if Length(MoveBuffer) > 1 then
@@ -254 +250 @@
 begin
   FullScreen := not FullScreen;
-  Core.PersistentForm1.SetFullScreen(FormMain.FullScreen);
+  Core.Core.PersistentForm1.SetFullScreen(FormMain.FullScreen);
   UpdateInterface;
 end;
@@ -269 +265 @@
 begin
   MenuItemFullScreen.Checked := FullScreen;
-  MenuItemMovesHistory.Visible := Core.Game.RecordHistory;
+  MenuItemMovesHistory.Visible := Core.Core.Game.RecordHistory;
   ToolsVisible := False;
   for I := 0 to MenuItemTools.Count - 1 do