Changeset 76 for trunk/UEngine.pas

Timestamp:

May 18, 2021, 10:25:20 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Colors inversion of used images if dark mode active.
• Fixed: Back button arrow drawn as image instead of font. Left arrow was not supported under Ubuntu.
• Modified: Allow to start new track from already connected station.

File:

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

trunk/UEngine.pas

@@ -277 +277 @@
   private
     FDarkMode: Boolean;
+    FOnDarkModeChange: TNotifyEvent;
     LastMousePos: TPoint;
     LastFocusedStation: TMapStation;
@@ -292 +293 @@
     MenuOptions: TMenu;
     MenuGame: TMenu;
-    ButtonBack: TMenuItemButton;
     LastState: TGameState;
     function GetServedDaysCount: Integer;
@@ -345 +345 @@
     State: TGameState;
     RedrawPending: Boolean;
+    ButtonBack: TMenuItemImage;
     ImagePassenger: TImage;
     ImageLocomotive: TImage;
@@ -365 +366 @@
     property DarkMode: Boolean read FDarkMode write SetDarkMode;
     property ServedDaysCount: Integer read GetServedDaysCount;
+    property OnDarkModeChange: TNotifyEvent read FOnDarkModeChange
+      write FOnDarkModeChange;
   end;
 
@@ -382 +385 @@
   ImagePassengerName = 'Images/Passenger.png';
   ImageLocomotiveName = 'Images/Locomotive.png';
+  ImageLeftArrowName = 'Images/Left arrow.png';
   TrainPassengerCount = 6;
   StationMinDistance = 100;
@@ -403 +407 @@
 
 uses
-  UGeometric, UFormMain, ULanguages;
+  UGeometric, UFormMain, ULanguages, UPixelPointer;
 
 resourcestring
@@ -1667 +1671 @@
   FDarkMode := AValue;
   InitColors;
+  if Assigned(FOnDarkModeChange) then FOnDarkModeChange(Self);
 end;
 
@@ -2643 +2648 @@
   NewIndex: Integer;
 begin
-  if Button = mbLeft then begin
-    if State <> gsMenu then begin
+  if (Button = mbLeft) and (State <> gsMenu) then begin
     MouseHold := True;
     LastFocusedStation := nil;
@@ -2656 +2660 @@
     // Select unused train
     if (Distance(Position, Point(View.DestRect.Right div 2 - Length(LineColors) div 2 * LineColorsDist - 100,
-    View.DestRect.Bottom - LineColorsDist)) < 30) and
+      View.DestRect.Bottom - LineColorsDist)) < 30) and
     (Trains.GetUnusedCount > 0) then begin
       SelectedTrain := Trains.GetUnusedTrain;
       Exit;
+    end;
+
+    // New track creation from selected station as start
+    Station := GetStationOnPos(View.PointDestToSrc(Position));
+    if Assigned(Station) then begin
+      if Assigned(SelectedLine) and (SelectedLine.LineStations.Count = 0) then NewLine := SelectedLine
+        else NewLine := GetUnusedLine;
+      if Assigned(NewLine) then begin
+        NewLine.ConnectStation(Station, nil, nil);
+        TrackStationDown := NewLine.Track.Points.Last;
+        TrackStationUp := nil;
+        LastFocusedStation := Station;
+        SelectedLine := NewLine;
+        Exit;
+      end;
     end;
 
@@ -2686 +2705 @@
     end;
     if Assigned(Track) then Track.Free;
-
-    // New track creation from selected station as start
-    Station := GetStationOnPos(View.PointDestToSrc(Position));
-    if Assigned(Station) then begin
-      if Assigned(SelectedLine) and (SelectedLine.LineStations.Count = 0) then NewLine := SelectedLine
-        else NewLine := GetUnusedLine;
-      if Assigned(NewLine) then begin
-        NewLine.ConnectStation(Station, nil, nil);
-        TrackStationDown := NewLine.Track.Points.Last;
-        TrackStationUp := nil;
-        LastFocusedStation := Station;
-      end;
-    end;
-    end;
   end;
 end;
@@ -2787 +2792 @@
 constructor TEngine.Create;
 begin
-  ButtonBack := TMenuItemButton.Create;
-  ButtonBack.Text := '🡸';
+  ButtonBack := TMenuItemImage.Create;
   ButtonBack.OnClick := ButtonBackClick;
   ButtonBack.BackgroundColor := clNone;
+  ButtonBack.Bounds := Bounds(0, 0, ScaleX(80, 96), ScaleY(80, 96));
   MenuMain := TMenu.Create;
   MenuOptions := TMenu.Create;