Changeset 335 for trunk

Timestamp:

Mar 31, 2021, 9:36:34 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Do not process panel wheel event outside of panel in main form.

File:

• trunk/LocalPlayer/Term.pas (modified) (11 diffs)

trunk/LocalPlayer/Term.pas

@@ -3562 +3562 @@
   MouseLoc: Integer;
 begin
-  if sb.ProcessMouseWheel(WheelDelta) then begin
-    PanelPaint;
-    Update;
+  if (MousePos.Y > ClientHeight - MidPanelHeight) and
+    (MousePos.Y < ClientHeight) then begin
+    if sb.ProcessMouseWheel(WheelDelta) then begin
+      PanelPaint;
+      Update;
+    end;
   end else begin
     if (WheelDelta > 0) and (MainMap.TileSize < High(TTileSize)) then begin
@@ -4883 +4886 @@
       LoweredTextOut(TopBar.Canvas, -1, MainTexture, xResearchSection + 48 +
         CostFactor + 26, 18, s);
-    end
+    end;
   end;
   if ClientMode <> cEditMap then
@@ -5234 +5237 @@
       RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
         xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini
-        + 2 + G.ly)
+        + 2 + G.ly);
     end
     else if MyMap[MouseLoc] and fCity <> 0 then { city clicked }
@@ -5247 +5250 @@
         UnitStatDlg.ShowNewContent_EnemyCity(wmPersistent, MouseLoc);
         DoCenter := false;
-      end
+      end;
     end
     else if MyMap[MouseLoc] and fUnit <> 0 then { unit clicked }
@@ -5269 +5272 @@
             end;
             if i = 0 then
-              uix := UnFocus
+              uix := UnFocus;
           end
           else
@@ -5295 +5298 @@
     begin
       Centre(MouseLoc);
-      PaintAllMaps
-    end
+      PaintAllMaps;
+    end;
   end
   else if (ClientMode <> cEditMap) and (Button = mbRight) and
@@ -5346 +5349 @@
           Status := Status and ($FFFF - usStay - usRecover - usGoto - usEnhance)
             or usWaiting;
-          MoveUnit(dx, dy, muAutoNext) { simple move }
+          MoveUnit(dx, dy, muAutoNext); { simple move }
         end
         else if GetMoveAdvice(UnFocus, MouseLoc, MoveAdviceData) >= rExecuted
@@ -5371 +5374 @@
               if BattleDlg.ModalResult <> mrOK then
                 exit;
-            end
+            end;
           end;
           DestinationMarkON := false;
@@ -5378 +5381 @@
             usWaiting;
           MoveToLoc(MouseLoc, false); { goto }
-        end
-      end
+        end;
+      end;
   end
   else if (Button = mbMiddle) and (UnFocus >= 0) and
@@ -5392 +5395 @@
       MoveToLoc(MouseLoc, true); { goto }
     if (UnFocus = uix) and (MyUn[uix].Loc = MouseLoc) then
-      MenuClick(mEnhance)
+      MenuClick(mEnhance);
   end
   else if (Button = mbLeft) and (ssShift in Shift) and
@@ -5427 +5430 @@
       BattleDlg.IsSuicideQuery := false;
       BattleDlg.Show;
-    end
-  end
+    end;
+  end;
 end;