Changeset 87 for trunk/Forms/UFormMain.pas

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.

File:

• trunk/Forms/UFormMain.pas (modified) (7 diffs)

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