Changeset 87

Timestamp:

Nov 15, 2014, 10:32:26 PM (10 years ago)

Author:

chronos

Message:

• Fixed: Allow map movement by mouse after moving cursor for at least defined number of pixels to minimalize accidental map move by clicking to map.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (5 diffs)
• Forms/UFormMain.pas (modified) (7 diffs)
• Forms/UFormNew.lfm (modified) (9 diffs)
• xtactics.lpi (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 592
+  ClientHeight = 595
   ClientWidth = 775
   Menu = MainMenu1
@@ -18 +18 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 29
-    Top = 563
+    Height = 26
+    Top = 569
     Width = 775
     Panels = <    
@@ -35 +35 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 563
+    Height = 569
     Top = 0
     Width = 40
@@ -116 +116 @@
   object PaintBox1: TPaintBox
     Left = 40
-    Height = 563
+    Height = 569
     Top = 0
     Width = 735
     Align = alClient
     OnMouseDown = PaintBox1MouseDown
+    OnMouseLeave = PaintBox1MouseLeave
     OnMouseMove = PaintBox1MouseMove
     OnMouseUp = PaintBox1MouseUp
-    OnMouseLeave = PaintBox1MouseLeave
     OnMouseWheelDown = PaintBox1MouseWheelDown
     OnMouseWheelUp = PaintBox1MouseWheelUp
@@ -198 +198 @@
   end
   object Timer1: TTimer
-    Interval = 10
+    Interval = 20
     OnTimer = Timer1Timer
     left = 154

trunk/Forms/UFormMain.pas

@@ -11 +11 @@
 const
   ZoomFactor = 1.5;
+  MouseMinDiff = 6;
 
 type
@@ -99 +100 @@
     MoveActive: Boolean;
     RedrawPending: Boolean;
+    Drawing: Boolean;
     DrawDuration: TDateTime;
     LastTimerTime: TDateTime;
@@ -162 +164 @@
   NewCaption: string;
 begin
-  if RedrawPending then begin
+  if RedrawPending and not Drawing then begin
+    Drawing := True;
     if not Core.DevelMode then RedrawPending := False;
     TimerPeriod := (9 * TimerPeriod + (Now - LastTimerTime)) / 10;
@@ -173 +176 @@
       NewCaption := Core.Game.CurrentPlayer.Name + ' - ' + STurn + ' ' + IntToStr(Core.Game.TurnCounter) + ' - ' + NewCaption;
     Caption := NewCaption;
+    Drawing := False;
   end;
 end;
@@ -221 +225 @@
 begin
   {$IFDEF Linux}
-  PaintBox1.ControlStyle := PaintBox1.ControlStyle + [csOpaque];
+  //PaintBox1.ControlStyle := PaintBox1.ControlStyle + [csOpaque];
   {$ENDIF}
   //DoubleBuffered := True;
@@ -355 +359 @@
   if Assigned(Core.Game.CurrentPlayer) then begin
     if MoveActive then
+    if (Abs(StartMousePoint.X - X) > MouseMinDiff) or (Abs(StartMousePoint.Y - Y) > MouseMinDiff) then
     with Core.Game.CurrentPlayer do begin
       if Mode = pmHuman then begin
@@ -384 +389 @@
 procedure TFormMain.PaintBox1MouseUp(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);
-const
-  MouseMinDiff = 10;
 begin
   if (Abs(StartMousePoint.X - X) < MouseMinDiff) and (Abs(StartMousePoint.Y - Y) < MouseMinDiff) then begin

trunk/Forms/UFormNew.lfm

@@ -1 +1 @@
 object FormNew: TFormNew
-  Left = 987
+  Left = 624
   Height = 528
-  Top = 500
+  Top = 313
   Width = 745
   Caption = 'New game'
@@ -52 +52 @@
     object TabSheet1: TTabSheet
       Caption = 'Players'
-      ClientHeight = 422
+      ClientHeight = 425
       ClientWidth = 739
       object ListView1: TListView
@@ -121 +121 @@
     object TabSheet2: TTabSheet
       Caption = 'Map'
-      ClientHeight = 422
+      ClientHeight = 425
       ClientWidth = 739
       object Label1: TLabel
@@ -337 +337 @@
     object TabSheet3: TTabSheet
       Caption = 'Rules'
-      ClientHeight = 422
+      ClientHeight = 425
       ClientWidth = 739
       object RadioGroupGrowCells: TRadioGroup
@@ -353 +353 @@
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 78
+        ClientHeight = 81
         ClientWidth = 308
         Items.Strings = (
@@ -364 +364 @@
       object Label6: TLabel
         Left = 8
-        Height = 25
+        Height = 22
         Top = 248
-        Width = 129
+        Width = 114
         Caption = 'Win objective:'
         ParentColor = False
@@ -372 +372 @@
       object ComboBoxWinObjective: TComboBox
         Left = 232
-        Height = 37
+        Height = 34
         Top = 240
         Width = 328
@@ -399 +399 @@
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 49
+        ClientHeight = 52
         ClientWidth = 301
         Items.Strings = (
@@ -409 +409 @@
       object CheckBoxFogOfWar: TCheckBox
         Left = 336
-        Height = 27
+        Height = 24
         Top = 24
-        Width = 120
+        Width = 106
         Caption = 'Fog of war'
         TabOrder = 3

trunk/xtactics.lpi

@@ -111 +111 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UFormPlayer"/>
       </Unit3>
       <Unit4>