Fix issue with incorrect scene viewport hover handling

Author: kagenocookie

ContentEditor.App/EngineObjects/SceneMouseHandler.cs

@@ -18,6 +18,7 @@ public class SceneMouseHandler(Scene scene)
     public Vector2 MouseViewportPosition { get; private set; }
     public Vector2 MouseScreenPosition => MouseViewportPosition + ViewportOffset;
 
+    public bool IsViewportHovered { get; private set; }
     public bool IsLeftDown => IsDown(ImGuiMouseButton.Left);
     public bool IsRightDown => IsDown(ImGuiMouseButton.Right);
     public bool IsMiddleDown => IsDown(ImGuiMouseButton.Middle);
@@ -114,36 +115,37 @@ private ref bool IsDown(ImGuiMouseButton button)
 
     private MouseButtonFlags DownFlags => (downLB ? MouseButtonFlags.Left : 0) | (downRB ? MouseButtonFlags.Right : 0) | (downMB ? MouseButtonFlags.Middle : 0);
 
-    public void UpdateMouseState(IMouse mouse, bool leftDown, bool rightDown, bool middleDown, bool allowDown, Vector2 mouseScreenPos)
+    public void UpdateMouseState(IMouse mouse, bool leftDown, bool rightDown, bool middleDown, bool isHovered, Vector2 mouseScreenPos)
     {
+        IsViewportHovered = isHovered;
         if (leftDown != downLB) {
             if (!leftDown) {
                 HandleMouseUp(mouse, ImGuiMouseButton.Left, mouseScreenPos);
-            } else if (allowDown) {
+            } else if (isHovered) {
                 HandleMouseDown(ImGuiMouseButton.Left, mouseScreenPos);
             }
         }
 
         if (rightDown != downRB) {
             if (!rightDown) {
                 HandleMouseUp(mouse, ImGuiMouseButton.Right, mouseScreenPos);
-            } else if (allowDown) {
+            } else if (isHovered) {
                 HandleMouseDown(ImGuiMouseButton.Right, mouseScreenPos);
             }
         }
 
         if (middleDown != downMB) {
             if (middleDown) {
                 HandleMouseUp(mouse, ImGuiMouseButton.Middle, mouseScreenPos);
-            } else if (allowDown) {
+            } else if (isHovered) {
                 HandleMouseDown(ImGuiMouseButton.Middle, mouseScreenPos);
             }
         }
 
         if (lastMousePos != mouseScreenPos - ViewportOffset) {
             HandleMouseMove(mouse, mouseScreenPos);
         }
-        if (allowDown) {
+        if (isHovered) {
             MouseWheelDelta = new Vector2(0, ImGui.GetIO().MouseWheel);
         } else {
             MouseWheelDelta = Vector2.Zero;

ContentEditor.App/Graphics/Gizmos/GizmoState.cs

@@ -115,7 +115,7 @@ public bool ArrowHandle(ref Vector3 position, out int handleId, Vector3 axis, Ax
         if (activeHandle == null || !isHandleActive) {
             var mouse = Scene.Mouse.MouseScreenPosition;
             if (!Scene.Mouse.IsDragging) {
-                if (CheckOverlapLine2D(pos1, pos2, screenRadius, mouse)) {
+                if (Scene.Mouse.IsViewportHovered && CheckOverlapLine2D(pos1, pos2, screenRadius, mouse)) {
                     ReserveHandle(current.id, handleId);
                     container.PushMaterial((GizmoMaterialPreset)(axisType + (int)GizmoMaterialPreset.AxisX_Highlight), ShapeBuilder.GeometryType.Filled);
                     if (Scene.Mouse.IsLeftDown) {
@@ -167,7 +167,7 @@ public bool RotationHandle(Vector3 position, ref Quaternion quaternion, out int
             var mouse = Scene.Mouse.MouseScreenPosition;
             if (!Scene.Mouse.IsDragging) {
                 var screenPosition = Scene.ActiveCamera.WorldToScreenPosition(position);
-                if (Scene.ActiveCamera.IsPointInViewport(screenPosition) && CheckOverlapProjectedCircle(position, axis, mouse, handleSize, handleSize * 0.1f)) {
+                if (Scene.Mouse.IsViewportHovered && Scene.ActiveCamera.IsPointInViewport(screenPosition) && CheckOverlapProjectedCircle(position, axis, mouse, handleSize, handleSize * 0.1f)) {
                     ReserveHandle(current.id, handleId);
                     container.PushMaterial((GizmoMaterialPreset)(axisType + (int)GizmoMaterialPreset.AxisX_Highlight), ShapeBuilder.GeometryType.Line);
                     if (Scene.Mouse.IsLeftDown) {
@@ -225,7 +225,7 @@ public bool PointHandle(ref Vector3 position, out int handleId, float handleSize
         var screenPosition = Scene.ActiveCamera.WorldToScreenPosition(position);
         if (container.CanActivate && (activeHandle == null || !isHandleActive)) {
             var mouse = Scene.Mouse.MouseScreenPosition;
-            if ((mouse - screenPosition).LengthSquared() < handleSize * handleSize && !Scene.Mouse.IsDragging) {
+            if (Scene.Mouse.IsViewportHovered && (mouse - screenPosition).LengthSquared() < handleSize * handleSize && !Scene.Mouse.IsDragging) {
                 ReserveHandle(current.id, handleId);
                 // TODO not ideal - needless allocations - optimize later
                 DrawListQueue.Add(() => {

ContentEditor.App/Imgui/App/SceneView.cs

@@ -117,7 +117,7 @@ public void OnIMGUI()
             isDragging = false;
         }
 
-        if (isDragging || hoveredMesh) {
+        if (isDragging || hoveredMesh || Scene.Mouse.IsViewportHovered && !hoveredMesh) {
             AppImguiHelpers.RedirectMouseInputToScene(Scene, hoveredMesh);
         }
     }

ContentEditor.App/Imgui/Components/MeshComponentHandler.cs

@@ -46,10 +46,10 @@ protected override bool ShowTree(UIContext context, RszInstance instance)
             if (ImguiHelpers.ToggleButton(isFocused ? $"{AppIcons.Star}" : $"{AppIcons.StarEmpty}", ref isFocused, Colors.IconActive)) {
                 if (isFocused) {
                     component.focusedGroup = instance;
-                    component.focusedGroupElementIndex = -1;
                 } else {
                     component.focusedGroup = null;
                 }
+                component.focusedGroupElementIndex = -1;
             }
             ImguiHelpers.Tooltip("Focus on this mesh group gizmo");
             ImGui.SameLine();