Improved cursor hiding when clicking on scrollbars

Pyrdacor · Sep 1, 2020 · fd9065f · fd9065f
1 parent 6e96af4
commit fd9065f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Ambermoon.Core/Game.cs b/Ambermoon.Core/Game.cs
@@ -584,9 +584,11 @@ public void OnMouseDown(Position position, MouseButtons buttons)
                 else
                 {
                     var cursorType = CursorType.Sword;
-                    layout.Click(relativePosition, buttons);
-                    layout.Hover(relativePosition, ref cursorType); // Update cursor
+                    layout.Click(relativePosition, buttons, ref cursorType);
                     cursor.Type = cursorType;
+                    layout.Hover(relativePosition, ref cursorType); // Update cursor
+                    if (cursor.Type != CursorType.None)
+                        cursor.Type = cursorType;
 
                     // TODO: check for other clicks
                 }

diff --git a/Ambermoon.Core/UI/ItemGrid.cs b/Ambermoon.Core/UI/ItemGrid.cs
@@ -254,7 +254,7 @@ public void LeftMouseUp(Position position)
         }
 
         public bool Click(Game game, Position position, Layout.DraggedItem draggedItem,
-            out Layout.DraggedItem pickedUpItem, bool leftMouseButton)
+            out Layout.DraggedItem pickedUpItem, bool leftMouseButton, ref CursorType cursorType)
         {
             pickedUpItem = draggedItem;
 
@@ -266,6 +266,8 @@ public bool Click(Game game, Position position, Layout.DraggedItem draggedItem,
                     draggedItem.Item.Visible = false;
                 }
 
+                cursorType = CursorType.None;
+
                 return true;
             }
 

diff --git a/Ambermoon.Core/UI/Layout.cs b/Ambermoon.Core/UI/Layout.cs
@@ -497,14 +497,14 @@ public void LeftMouseUp(Position position)
                 itemGrid.LeftMouseUp(position);
         }
 
-        public bool Click(Position position, MouseButtons buttons)
+        public bool Click(Position position, MouseButtons buttons, ref CursorType cursorType)
         {
             if (buttons == MouseButtons.Left)
             {
                 foreach (var itemGrid in itemGrids)
                 {
                     // TODO: If stacked it should ask for amount with left mouse
-                    if (itemGrid.Click(game, position, draggedItem, out DraggedItem pickedUpItem, true))
+                    if (itemGrid.Click(game, position, draggedItem, out DraggedItem pickedUpItem, true, ref cursorType))
                     {
                         DraggedItem dropped = (draggedItem != null && (pickedUpItem == null || pickedUpItem != draggedItem ||
                             pickedUpItem.Item.Item.Amount != draggedItem.Item.Item.Amount)) ? draggedItem : null;
@@ -534,7 +534,7 @@ public bool Click(Position position, MouseButtons buttons)
                 {
                     foreach (var itemGrid in itemGrids)
                     {
-                        if (itemGrid.Click(game, position, null, out DraggedItem pickedUpItem, false))
+                        if (itemGrid.Click(game, position, null, out DraggedItem pickedUpItem, false, ref cursorType))
                         {
                             if (pickedUpItem != null)
                             {