Changeset 245 for trunk/Forms

Timestamp:

Sep 22, 2018, 1:07:53 PM (6 years ago)

Author:

chronos

Message:

• Added: Limit minimum and maximum map zoom.

Location:

trunk/Forms

Files:

• UFormClient.lfm (modified) (4 diffs)
• UFormClient.pas (modified) (3 diffs)
• UFormHelp.pas (modified) (1 diff)

trunk/Forms/UFormClient.lfm

@@ -7 +7 @@
   ClientHeight = 621
   ClientWidth = 775
-  DesignTimePPI = 120
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
@@ -17 +17 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 28
-    Top = 593
+    Height = 30
+    Top = 591
     Width = 775
     Panels = <    
@@ -34 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 593
+    Height = 591
     Top = 0
     Width = 32
@@ -80 +80 @@
   object PaintBox1: TPaintBox
     Left = 32
-    Height = 593
+    Height = 591
     Top = 0
     Width = 743

trunk/Forms/UFormClient.pas

@@ -12 +12 @@
 const
   ZoomFactor = 1.5;
+  MinZoom = 0.05;
+  MaxZoom = 10;
   MouseMinDiff = 0.1;
 
@@ -447 +449 @@
 begin
   with Client do begin
-    View.Zoom := View.Zoom * ZoomFactor;
+    if View.Zoom * ZoomFactor < MaxZoom then
+      View.Zoom := View.Zoom * ZoomFactor;
   end;
   Redraw;
@@ -453 +456 @@
 
 procedure TFormClient.AZoomOutExecute(Sender: TObject);
-//var
-//  D: TPoint;
 begin
   with Client do begin
-    //D := Point(Trunc(MousePos.X - View.Left / ViewZoom),
-    //  Trunc(MousePos.Y - View.Top / ViewZoom));
-    View.Zoom := View.Zoom / ZoomFactor;
-    //View := Bounds(Trunc((D.X - MousePos.X) * ViewZoom),
-    //  Trunc((D.Y - MousePos.Y) * ViewZoom),
-    //  View.Right - View.Left,
-    //  View.Bottom - View.Top);
+    if View.Zoom / ZoomFactor > MinZoom then
+      View.Zoom := View.Zoom / ZoomFactor;
   end;
   Redraw;

trunk/Forms/UFormHelp.pas

@@ -52 +52 @@
     'In case of tie, defender wins. Loser lose its unit and another pair of dices is evaluated. ' +
     'This process is calculated automatically and for each planned attack win ' +
-    'probability is displayed.';
+    'probability is displayed.' +
+    LineEnding + LineEnding +
+    'Units can be moved by clicking on owned cell and then by clicking on target neutral ' +
+    'or enemy cell. Moves can be set to be repeated every turn with defined number of units. ' +
+    'Repeated unit moves can be set in Unit move dialog or simply by holding Control key while selecting target cell. ' +
+    'If there are multiple unit moves from one cell to more other cells and ' +
+    'you want to move all available cells to target cell, then you can do so by holding Shift key while selecting target cell.';
 
 {$R *.lfm}