Changeset 121 for trunk/UEngine.pas

Timestamp:

Oct 26, 2022, 3:12:02 PM (19 months ago)

Author:

chronos

Message:

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

File:

• trunk/UEngine.pas (modified) (10 diffs)

trunk/UEngine.pas

@@ -157 +157 @@
     miFastTrain);
   TMetroImprovementSet = set of TMetroImprovement;
+  TFullScrenChangeEvent = procedure (Sender: TObject; Active: Boolean) of object;
 
   { TEngine }
 
-  TEngine = class
+  TEngine = class(TComponent)
   private
     FDarkMode: Boolean;
+    FFullScreen: Boolean;
     FOnDarkModeChange: TNotifyEvent;
+    FOnExit: TNotifyEvent;
+    FOnFullScreenChange: TFullScrenChangeEvent;
     FState: TGameState;
     FTranslator: TTranslator;
@@ -219 +223 @@
       UpdatedShape: TStationShape; Distance: Integer);
     procedure SetDarkMode(AValue: Boolean);
+    procedure SetFullScreen(AValue: Boolean);
     procedure SetState(AValue: TGameState);
     procedure TrainsMovement;
@@ -304 +309 @@
     procedure LoadFromRegistry;
     procedure SaveToRegistry;
-    constructor Create;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure Tick;
@@ -313 +318 @@
   published
     property DarkMode: Boolean read FDarkMode write SetDarkMode;
+    property FullScreen: Boolean read FFullScreen write SetFullScreen;
     property Translator: TTranslator read FTranslator write FTranslator;
     property OnDarkModeChange: TNotifyEvent read FOnDarkModeChange
       write FOnDarkModeChange;
+    property OnFullScreenChange: TFullScrenChangeEvent read FOnFullScreenChange
+      write FOnFullScreenChange;
+    property OnExit: TNotifyEvent read FOnExit write FOnExit;
   end;
 
@@ -349 +358 @@
 
 uses
-  UFormMain, ULanguages;
+  ULanguages;
 
 resourcestring
@@ -1404 +1413 @@
 end;
 
+procedure TEngine.SetFullScreen(AValue: Boolean);
+begin
+  if FFullScreen = AValue then Exit;
+  FFullScreen := AValue;
+  if Assigned(FOnFullScreenChange) then
+    FOnFullScreenChange(Self, FFullScreen);
+end;
+
 procedure TEngine.SetState(AValue: TGameState);
 begin
@@ -1660 +1677 @@
 procedure TEngine.MenuItemExit(Sender: TObject);
 begin
-  FormMain.Close;
+  if Assigned(FOnExit) then FOnExit(Self);
 end;
 
@@ -1739 +1756 @@
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
-      Checked := FormMain.FullScreen;
+      Checked := FullScreen;
     end;
     with AddButton(SBack, MenuItemBack) do begin
@@ -1883 +1900 @@
 procedure TEngine.FullScreenChanged(Sender: TObject);
 begin
-  FormMain.FullScreen := TMenuItemCheckBox(Sender).Checked;
-  with TPersistentForm.Create(nil) do
-  try
-    Form := FormMain;
-    SetFullScreen(FormMain.FullScreen);
-  finally
-    Free;
-  end;
+  FullScreen := TMenuItemCheckBox(Sender).Checked;
 end;
 
@@ -3362 +3372 @@
 end;
 
-constructor TEngine.Create;
-begin
+constructor TEngine.Create(AOwner: TComponent);
+begin
+  inherited;
   ImprovementImageSize := ScaleX(64, 96);
   IconSize := ScaleX(32, 96);