[GUI] Fix for warning and missing close icon under Unity 2023

LogicalError · Jul 15, 2024 · aab45f0 · aab45f0
1 parent 9a39f85
commit aab45f0
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 6 deletions.
diff --git a/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModeSelection.GUI.cs b/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModeSelection.GUI.cs
@@ -151,7 +151,7 @@ static void OnEditModeSelectionSceneGUI()
 					buttonArea.y = 2;
 					buttonArea.height = 13;
 					buttonArea.width = 13;
-					if (GUI.Button(buttonArea, GUIContent.none, "WinBtnClose"))
+					if (GUI.Button(buttonArea, GUIContent.none, CSG_GUIStyleUtility.winBtnClose))
 						EditModeToolWindowSceneGUI.GetWindow();
 					TooltipUtility.SetToolTip(CSG_GUIStyleUtility.PopOutTooltip, buttonArea); 
 

diff --git a/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Clip.GUI.cs b/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Clip.GUI.cs
@@ -60,7 +60,7 @@ public static void OnSceneGUI(Rect windowRect, EditModeClip tool)
 						buttonArea.y += 2;
 						buttonArea.height = 13;
 						buttonArea.width = 13;
-						if (GUI.Button(buttonArea, GUIContent.none, "WinBtnClose"))
+						if (GUI.Button(buttonArea, GUIContent.none, CSG_GUIStyleUtility.winBtnClose))
 							EditModeToolWindowSceneGUI.GetWindow();
 						TooltipUtility.SetToolTip(CSG_GUIStyleUtility.PopOutTooltip, buttonArea);
 

diff --git a/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Edit.GUI.cs b/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Edit.GUI.cs
@@ -47,7 +47,7 @@ public static void OnSceneGUI(Rect windowRect, EditModeMeshEdit tool)
 						buttonArea.y += 2;
 						buttonArea.height = 13;
 						buttonArea.width = 13;
-						if (GUI.Button(buttonArea, GUIContent.none, "WinBtnClose"))
+						if (GUI.Button(buttonArea, GUIContent.none, CSG_GUIStyleUtility.winBtnClose))
 							EditModeToolWindowSceneGUI.GetWindow();
 						TooltipUtility.SetToolTip(CSG_GUIStyleUtility.PopOutTooltip, buttonArea);
 

diff --git a/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Generate.GUI.cs b/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Generate.GUI.cs
@@ -48,7 +48,7 @@ public static bool OnSceneGUI(Rect windowRect, EditModeGenerate tool)
 						buttonArea.y += 2;
 						buttonArea.height = 13;
 						buttonArea.width = 13;
-						if (GUI.Button(buttonArea, GUIContent.none, "WinBtnClose"))
+						if (GUI.Button(buttonArea, GUIContent.none, CSG_GUIStyleUtility.winBtnClose))
 							EditModeToolWindowSceneGUI.GetWindow();
 						TooltipUtility.SetToolTip(CSG_GUIStyleUtility.PopOutTooltip, buttonArea);
 

diff --git a/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Place.GUI.cs b/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Place.GUI.cs
@@ -48,7 +48,7 @@ public static void OnSceneGUI(Rect windowRect, EditModePlace tool)
 						buttonArea.y += 2;
 						buttonArea.height = 13;
 						buttonArea.width = 13;
-						if (GUI.Button(buttonArea, GUIContent.none, "WinBtnClose"))
+						if (GUI.Button(buttonArea, GUIContent.none, CSG_GUIStyleUtility.winBtnClose))
 							EditModeToolWindowSceneGUI.GetWindow();
 						TooltipUtility.SetToolTip(CSG_GUIStyleUtility.PopOutTooltip, buttonArea);
 

diff --git a/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Surface.GUI.cs b/Plugins/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Surface.GUI.cs
@@ -1083,7 +1083,7 @@ public static void OnSceneGUI(Rect windowRect, EditModeSurface tool)
 			buttonArea.y += 2;
 			buttonArea.height = 13;
 			buttonArea.width = 13;
-			if (GUI.Button(buttonArea, GUIContent.none, "WinBtnClose"))
+			if (GUI.Button(buttonArea, GUIContent.none, CSG_GUIStyleUtility.winBtnClose))
 				EditModeToolWindowSceneGUI.GetWindow();
 
 			TooltipUtility.SetToolTip(CSG_GUIStyleUtility.PopOutTooltip, buttonArea);

diff --git a/Plugins/Editor/Scripts/View/GUI/Utility/CSG_GUIStyleUtility.cs b/Plugins/Editor/Scripts/View/GUI/Utility/CSG_GUIStyleUtility.cs
@@ -92,6 +92,8 @@ internal static class CSG_GUIStyleUtility
 
 		public static GUIStyle unpaddedWindow;
 
+        public static GUIStyle winBtnClose;
+
 		public static GUILayoutOption[] ContentEmpty = new GUILayoutOption[0];
 
 
@@ -364,6 +366,24 @@ public static void InitStyles()
 
 			selectionRectStyle = GetStyle("selectionRect");
 
+            winBtnClose = new GUIStyle(GUI.skin.verticalScrollbarUpButton);
+            winBtnClose.normal.background = Resources.Load<Texture2D>("GUI/WinBtnClose");
+            winBtnClose.onActive.background =
+            winBtnClose.onFocused.background =
+            winBtnClose.onNormal.background =
+            winBtnClose.onHover.background =
+            winBtnClose.hover.background =
+            winBtnClose.focused.background =
+            winBtnClose.active.background = null;
+            winBtnClose.fixedHeight = 16f;
+            winBtnClose.fixedWidth = 16f;
+            winBtnClose.overflow.bottom = 0;
+            winBtnClose.overflow.top = 0;
+            winBtnClose.overflow.right = 0;
+            winBtnClose.overflow.left = 0;
+
+
+
 
 			var redToolbarDropDown = GetStyle("toolbarDropDown");