From cccd02255fd8185a7218e4732cc843452fe942b0 Mon Sep 17 00:00:00 2001 From: Sinai Date: Sat, 15 May 2021 20:39:29 +1000 Subject: [PATCH] Force stop panel drag/resize when starting Inspect Under Mouse --- src/UI/Inspectors/InspectUnderMouse.cs | 2 ++ src/UI/Panels/PanelDragger.cs | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/UI/Inspectors/InspectUnderMouse.cs b/src/UI/Inspectors/InspectUnderMouse.cs index 4df6d7a..19bf893 100644 --- a/src/UI/Inspectors/InspectUnderMouse.cs +++ b/src/UI/Inspectors/InspectUnderMouse.cs @@ -71,6 +71,8 @@ namespace UnityExplorer.UI.Inspectors if (!MainCamera) return; + PanelDragger.ForceEnd(); + Mode = mode; Inspecting = true; UIManager.NavBarRect.gameObject.SetActive(false); diff --git a/src/UI/Panels/PanelDragger.cs b/src/UI/Panels/PanelDragger.cs index 1809b02..abc856e 100644 --- a/src/UI/Panels/PanelDragger.cs +++ b/src/UI/Panels/PanelDragger.cs @@ -17,6 +17,20 @@ namespace UnityExplorer.UI.Panels public static bool Resizing { get; private set; } + public static bool ResizePrompting => s_resizeCursorObj && s_resizeCursorObj.activeSelf; + + internal static void ForceEnd() + { + s_resizeCursorObj.SetActive(false); + wasAnyDragging = false; + + foreach (var instance in Instances) + { + instance.WasDragging = false; + instance.WasResizing = false; + } + } + internal static List Instances = new List(); static PanelDragger() @@ -82,7 +96,6 @@ namespace UnityExplorer.UI.Panels #endregion - public static bool ResizePrompting => s_resizeCursorObj && s_resizeCursorObj.activeSelf; public static GameObject s_resizeCursorObj; internal static bool wasAnyDragging;