Changeset 269 for trunk/Forms/UFormClient.pas

Timestamp:

Jan 21, 2019, 12:38:20 AM (6 years ago)

Author:

chronos

Message:

• Added: Map random preview in New game form.

File:

• trunk/Forms/UFormClient.pas (modified) (6 diffs)

trunk/Forms/UFormClient.pas

@@ -106 +106 @@
   FormClient: TFormClient;
 
+const
+  MapBackgroundColor = $404040;
+
 implementation
 
@@ -180 +183 @@
   X, Y: Integer;
   TempView: TView;
-const
-  BackgroundColor = $404040;
 begin
   DrawStart := Now;
@@ -189 +190 @@
     if csOpaque in PaintBox1.ControlStyle then begin
       TempBitmap.SetSize(PaintBox1.Width, PaintBox1.Height);
-      TempBitmap.Canvas.Brush.Color := BackGroundColor; //clBackground; //PaintBox1.GetColorResolvingParent;
+      TempBitmap.Canvas.Brush.Color := MapBackGroundColor; //clBackground; //PaintBox1.GetColorResolvingParent;
       TempBitmap.Canvas.FillRect(0, 0, PaintBox1.Width, PaintBox1.Height);
       Client.Paint(TempBitmap.Canvas, View);
@@ -238 +239 @@
               )
             );
-            Client.Paint(PaintBox1.Canvas, TempView);
+            Client.DrawCells(PaintBox1.Canvas, TempView);
           end;
         end;
@@ -291 +292 @@
         end;
       end else begin
-        Client.DrawCellLinks(PaintBox1.Canvas, View);
         Client.Paint(PaintBox1.Canvas, View);
-        Client.DrawCities(PaintBox1.Canvas, View);
-        Client.DrawSelection(PaintBox1.Canvas, View);
-        Client.DrawArrows(PaintBox1.Canvas, View);
       end;
     end;
@@ -436 +433 @@
 
 procedure TFormClient.AZoomAllExecute(Sender: TObject);
-var
-  Factor: TPointF;
-  MapRect: TRect;
-  NewZoom: Single;
 begin
   with Core, Game, Client, View do begin
-    MapRect := Map.CalculatePixelRect;
-    Factor := TPointF.Create(DestRect.Size.X / MapRect.Size.X,
-      DestRect.Size.Y / MapRect.Size.Y);
-    if Factor.X < Factor.Y then NewZoom := Factor.X
-      else NewZoom := Factor.Y;
-    if NewZoom = 0 then NewZoom := 1;
-    Zoom := NewZoom;
-    CenterMap;
+    ZoomAll;
   end;
   Redraw;