Changeset 98 for trunk/UEngine.pas

Timestamp:

Sep 28, 2022, 1:45:58 PM (20 months ago)

Author:

chronos

Message:

• Modified: Do not change view zoom if new station is already visible.
• Fixed: Line icon normalized.

File:

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

trunk/UEngine.pas

@@ -1032 +1032 @@
 { TEngine }
 
+// Need to see all stations on screen
 procedure TEngine.ResizeView;
 var
   NewPoint: TPoint;
-begin
-  // Need to see all stations on screen
-  View.SourceRect := RectEnlarge(Stations.GetRect, 100);
-
+  Intersected: TRect;
+  NewView: TView;
+begin
+  NewView := TView.Create;
+  NewView.Assign(View);
+
+  NewView.SourceRect := RectEnlarge(Stations.GetRect, 100);
   NewPoint := Point(
-    Trunc((View.SourceRect.Left + (View.SourceRect.Right - View.SourceRect.Left) / 2) -
-    (View.DestRect.Left + (View.DestRect.Right - View.DestRect.Left) / 2 / View.Zoom)),
-    Trunc((View.SourceRect.Top + (View.SourceRect.Bottom - View.SourceRect.Top) / 2) -
-    (View.DestRect.Top + (View.DestRect.Bottom - View.DestRect.Top) / 2 / View.Zoom)));
-  View.SourceRect := Bounds(NewPoint.X, NewPoint.Y, Trunc((View.DestRect.Right - View.DestRect.Left) / View.Zoom),
-    Trunc((View.DestRect.Bottom - View.DestRect.Top) / View.Zoom));
+    Trunc((NewView.SourceRect.Left + (NewView.SourceRect.Right - NewView.SourceRect.Left) / 2) -
+    (NewView.DestRect.Left + (NewView.DestRect.Right - NewView.DestRect.Left) / 2 / NewView.Zoom)),
+    Trunc((NewView.SourceRect.Top + (NewView.SourceRect.Bottom - NewView.SourceRect.Top) / 2) -
+    (NewView.DestRect.Top + (NewView.DestRect.Bottom - NewView.DestRect.Top) / 2 / NewView.Zoom)));
+  NewView.SourceRect := Bounds(NewPoint.X, NewPoint.Y, Trunc((NewView.DestRect.Right - NewView.DestRect.Left) / NewView.Zoom),
+    Trunc((NewView.DestRect.Bottom - NewView.DestRect.Top) / NewView.Zoom));
+
+  Intersected := NewView.SourceRect;
+  Intersected.Union(View.SourceRect);
+  if Intersected = View.SourceRect then Exit;
+
+  View.Assign(NewView);
+
+  NewView.Free;
 end;
 
@@ -2560 +2572 @@
     end;
 
-    // Add new stations
+    // Add new station
     if (Time - LastNewStationTime) > NewStationPeriod then begin
       LastNewStationTime := Time;
@@ -2860 +2872 @@
   KeyF4 = 115;
   KeyF5 = 116;
+  KeyF6 = 117;
 begin
   if Key = KeyEsc then begin
@@ -2893 +2906 @@
       Redraw;
     end;
+  end else
+  if Key = KeyF6 then begin
+    if State = gsRunning then begin
+      Stations.AddNew;
+      ResizeView;
+      Redraw;
+    end;
   end;
   {$ENDIF}
@@ -2910 +2930 @@
   Lines.Clear;
   Stations.Clear;
+  View.SourceRect := Bounds(0, 0, 0, 0);
 end;