Make interactables respect PlatformBackend.WantsMouseCapture

Author: jounjj

Pulsar4X/Pulsar4X.Client/PulsarMainWindow.cs

@@ -153,7 +153,7 @@ public override void HandleEvent(SDL.Event e)
                 return;
             }
 
-            if (!PlatformBackend.WantsMouseCapture() || _state.IsMouseOverMapOverlay)
+            if (!PlatformBackend.WantsMouseCapture())
             {
                 switch (e.Type)
                 {
@@ -177,9 +177,6 @@ public override void Update()
         {
             base.Update();
 
-            // Reset map overlay hover state at the start of each frame
-            _state.IsMouseOverMapOverlay = false;
-
             //update and refresh state for GameDateTimechange
             if(_state.Game != null)
             {

Pulsar4X/Pulsar4X.Client/Rendering/SystemMapRendering.cs

@@ -67,6 +67,9 @@ internal SystemMapRendering(SDL3Window window, GlobalUIState state)
 
             var mainWin = (PulsarMainWindow)window;
             mainWin.MouseButtonDownOccured += (object sender, SDL.Event e) => {
+                if (mainWin.PlatformBackend.WantsMouseCapture())
+                    return;
+
                 foreach (var i in _interactableGrouped)
                 {
                     var key = i.Key;
@@ -87,6 +90,9 @@ internal SystemMapRendering(SDL3Window window, GlobalUIState state)
                 }
             };
             mainWin.MouseButtonUpOccured += (object sender, SDL.Event e) => {
+                if (mainWin.PlatformBackend.WantsMouseCapture())
+                    return;
+
                 foreach (var i in _interactableGrouped)
                 {
                     var key = i.Key;
@@ -115,6 +121,17 @@ internal SystemMapRendering(SDL3Window window, GlobalUIState state)
                     {
                         var item = j.Item;
 
+                        if (mainWin.PlatformBackend.WantsMouseCapture())
+                        {
+                            if (j.IsHovered)
+                            {
+                                j.IsHovered = false;
+                                if (item.OnPointerExit(e))
+                                    return;
+                            }
+                            continue;
+                        }
+
                         var c = item.Contains(new (e.Motion.X, e.Motion.Y));
 
                         if (j.IsHovered)

Pulsar4X/Pulsar4X.Client/State/GlobalUIState.cs

@@ -117,13 +117,6 @@ public class GlobalUIState
 
         internal View? SelectedMapView { get; set; } = null;
 
-        /// <summary>
-        /// True when the mouse is hovering over a map overlay (like name icons) that should
-        /// allow scroll wheel input to pass through to the map for zooming.
-        /// This is set during rendering and checked during the next frame's event handling.
-        /// </summary>
-        internal bool IsMouseOverMapOverlay = false;
-
         // Game Settings
         internal GameSettings GameSettings { get; set; }