From bdf86a744850d886c715023508ec004c015008b9 Mon Sep 17 00:00:00 2001 From: sinaioutlander <49360850+sinaioutlander@users.noreply.github.com> Date: Wed, 14 Oct 2020 20:55:44 +1100 Subject: [PATCH] 2.0.6 --- src/UI/Shared/ResizeDrag.cs | 2 +- src/UI/TabViewWindow.cs | 2 +- src/Unstrip/IMGUI/Internal.cs | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/UI/Shared/ResizeDrag.cs b/src/UI/Shared/ResizeDrag.cs index b62f677..fe73ee3 100644 --- a/src/UI/Shared/ResizeDrag.cs +++ b/src/UI/Shared/ResizeDrag.cs @@ -48,7 +48,7 @@ namespace Explorer.UI.Shared { IsMouseInResizeArea = true; - if (InputManager.GetMouseButton(0)) + if (InputManager.GetMouseButtonDown(0)) { IsResizing = true; m_currentWindow = ID; diff --git a/src/UI/TabViewWindow.cs b/src/UI/TabViewWindow.cs index 1c34b65..de5d3ce 100644 --- a/src/UI/TabViewWindow.cs +++ b/src/UI/TabViewWindow.cs @@ -66,7 +66,7 @@ namespace Explorer.UI GUIUnstrip.BeginVertical(GUIContent.none, GUI.skin.box, null); GUIUnstrip.BeginHorizontal(new GUILayoutOption[0]); GUI.skin.button.alignment = TextAnchor.MiddleLeft; - int tabPerRow = (int)Math.Floor((float)((decimal)m_rect.width / 238)); + int tabPerRow = (int)Math.Floor(m_rect.width / 238); int rowCount = 0; for (int i = 0; i < WindowManager.Windows.Count; i++) { diff --git a/src/Unstrip/IMGUI/Internal.cs b/src/Unstrip/IMGUI/Internal.cs index f9e433b..c8d827c 100644 --- a/src/Unstrip/IMGUI/Internal.cs +++ b/src/Unstrip/IMGUI/Internal.cs @@ -76,6 +76,8 @@ namespace Explorer.Unstrip.IMGUI { text = text ?? string.Empty; + var skin = multiLine ? GUI.skin.textArea : GUI.skin.textField; + int controlID = GUIUtility.GetControlID(FocusType.Keyboard); GUIContent guicontent = GUIContent.Temp(text); bool flag = GUIUtility.keyboardControl != controlID; @@ -88,13 +90,13 @@ namespace Explorer.Unstrip.IMGUI guicontent = GUIContent.Temp(text); // guicontent = GUIContent.Temp(text + GUIUtility.compositionString); } - Rect rect = Internal_LayoutUtility.GetRect(guicontent, GUI.skin.textField, options); + Rect rect = Internal_LayoutUtility.GetRect(guicontent, skin, options); bool flag2 = GUIUtility.keyboardControl == controlID; if (flag2) { guicontent = GUIContent.Temp(text); } - DoTextField(rect, controlID, guicontent, multiLine, -1, GUI.skin.textField); + DoTextField(rect, controlID, guicontent, multiLine, -1, skin); return guicontent.text; }