Changeset 642

Timestamp:

Nov 23, 2024, 8:50:21 PM (3 hours ago)

Author:

chronos

Message:

• Fixed: Do not scroll map if mouse is outside of window region.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (1 diff)
• Packages/DpiControls/Dpi.Controls.pas (modified) (1 diff)

trunk/LocalPlayer/Term.pas

@@ -5583 +5583 @@
         MousePos := ScreenToClient(Mouse.CursorPos);
         if MousePos.Y < Height - PanelHeight then
-          if MousePos.X <= ScrollWidth then
+          if (MousePos.X >= 0) and (MousePos.X <= ScrollWidth) then
             dx := -ScrollSpeed // scroll left
-          else if MousePos.X >= Width - ScrollWidth - 1 then
+          else if (MousePos.X <= Width) and (MousePos.X >= Width - ScrollWidth - 1) then
             dx := ScrollSpeed; // scroll right
-        if MousePos.Y <= ScrollWidth then
+        if (MousePos.Y >= 0) and (MousePos.Y <= ScrollWidth) then
           dy := -ScrollSpeed // scroll up
-        else if (MousePos.Y >= Height - ScrollWidth - 1) and
+        else if (MousePos.Y <= Height) and (MousePos.Y >= Height - ScrollWidth - 1) and
           (MousePos.X >= TerrainBtn.Left + TerrainBtn.Width) and
           (MousePos.X < xRightPanel + 10 - 8) then

trunk/Packages/DpiControls/Dpi.Controls.pas

@@ -212 +212 @@
     property OnMouseUp: TMouseEvent read FOnMouseUp write FOnMouseUp;
     property OnMouseWheel: TMouseWheelEvent read FOnMouseWheel write FOnMouseWheel;
+    property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter;
+    property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave;
   end;