Changeset 121 for trunk/Forms

Timestamp:

Oct 26, 2022, 3:12:02 PM (2 years ago)

Author:

chronos

Message:

• Modifed: Made TEngine class TComponent and to be independent from FormMain.

File:

• trunk/Forms/UFormMain.pas (modified) (7 diffs)

trunk/Forms/UFormMain.pas

@@ -38 +38 @@
   private
     Initialized: Boolean;
+    procedure FullScreenChangeExecute(Sender: TObject; Active: Boolean);
+    procedure ExitExecute(Sender: TObject);
     procedure LoadConfig;
     procedure SaveConfig;
     procedure LoadGraphicAssets;
-    procedure DarkModeChange(Sender: TObject);
+    procedure DarkModeChangeExecute(Sender: TObject);
     procedure CopyImage(DestBmp: TBitmap; SourceBmp: TBitmap; Grayed: Boolean = False);
   public
-    FullScreen: Boolean;
     Engine: TEngine;
     procedure EraseBackground(DC: HDC); override;
@@ -81 +82 @@
   {$ENDIF}
 
-  Engine := TEngine.Create;
+  Engine := TEngine.Create(nil);
   Engine.RegistryContext := ApplicationInfo1.GetRegistryContext;
   Engine.Translator := Core.Translator1;
+  Engine.OnFullScreenChange := FullScreenChangeExecute;
+  Engine.OnExit := ExitExecute;
   LoadConfig;
   // Load cities after language core is loaded to have city names translated
@@ -92 +95 @@
 end;
 
-procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  Core.PersistentForm1.Save(Self);
-end;
-
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
   SaveConfig;
   FreeAndNil(Engine);
+end;
+
+procedure TFormMain.FormShow(Sender: TObject);
+begin
+  if not Initialized then begin
+    Initialized := True;
+    Core.PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
+    Core.PersistentForm1.Load(Self, False, True);
+    Engine.FullScreen := Core.PersistentForm1.FormFullScreen;
+    Engine.InitMenus;
+    Engine.OnDarkModeChange := DarkModeChangeExecute;
+    Engine.Map.Size := Point(PaintBox1.Width, PaintBox1.Height);
+    Engine.View.DestRect := Rect(0, 0, PaintBox1.Width, PaintBox1.Height);
+    Engine.MainMenu;
+    LoadGraphicAssets;
+  end;
+end;
+
+procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  Core.PersistentForm1.Save(Self);
 end;
 
@@ -120 +139 @@
 begin
   if Key = KeyF11 then begin
-    FullScreen := not FullScreen;
-    Core.PersistentForm1.SetFullScreen(FormMain.FullScreen);
+    Engine.FullScreen := not Engine.FullScreen;
   end else
 {$IFDEF DEBUG}
@@ -141 +159 @@
 end;
 
-procedure TFormMain.FormShow(Sender: TObject);
-begin
-  if not Initialized then begin
-    Initialized := True;
-    Core.PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
-    Core.PersistentForm1.Load(Self, False, True);
-    FullScreen := Core.PersistentForm1.FormFullScreen;
-    Engine.InitMenus;
-    Engine.OnDarkModeChange := DarkModeChange;
-    Engine.Map.Size := Point(PaintBox1.Width, PaintBox1.Height);
-    Engine.View.DestRect := Rect(0, 0, PaintBox1.Width, PaintBox1.Height);
-    Engine.MainMenu;
-    LoadGraphicAssets;
-  end;
-end;
-
 procedure TFormMain.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);
@@ -214 +216 @@
   FormatSettings.ShortDayNames[6] := SFridayShort;
   FormatSettings.ShortDayNames[7] := SSaturdayShort;
+end;
+
+procedure TFormMain.FullScreenChangeExecute(Sender: TObject; Active: Boolean);
+begin
+  Core.PersistentForm1.SetFullScreen(Active);
+end;
+
+procedure TFormMain.ExitExecute(Sender: TObject);
+begin
+  Close;
 end;
 
@@ -306 +318 @@
 end;
 
-procedure TFormMain.DarkModeChange(Sender: TObject);
+procedure TFormMain.DarkModeChangeExecute(Sender: TObject);
 begin
   LoadGraphicAssets;