From 24f078fac53ac874eee84c21ef9cab98b6cf65c9 Mon Sep 17 00:00:00 2001 From: Shimmermare Date: Mon, 14 Aug 2023 16:39:05 +0300 Subject: [PATCH 1/2] Unity version dependent style name --- Editor/DropdownStyle.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Editor/DropdownStyle.cs b/Editor/DropdownStyle.cs index 6d58d30..28febee 100644 --- a/Editor/DropdownStyle.cs +++ b/Editor/DropdownStyle.cs @@ -49,8 +49,18 @@ internal static class DropdownStyle private static GUIStyle _searchToolbarStyle; - public static GUIStyle SearchToolbarStyle => - _searchToolbarStyle ?? (_searchToolbarStyle = new GUIStyle(GUI.skin.FindStyle("ToolbarSeachTextField"))); + public static GUIStyle SearchToolbarStyle + { + get + { + #if UNITY_2022_3_OR_NEWER + const string styleName = "ToolbarSearchTextField"; + #else + const string styleName = "ToolbarSeachTextField"; + #endif + return _searchToolbarStyle ?? (_searchToolbarStyle = new GUIStyle(GUI.skin.FindStyle(styleName))); + } + } private static readonly Color HighlightedColorDarkSkin = new Color(1f, 1f, 1f, 0.028f); private static readonly Color HighlightedColorLightSkin = new Color(1f, 1f, 1f, 0.3f); From bf703589e02f5b8caa1d0ab47757cbc245227031 Mon Sep 17 00:00:00 2001 From: Shimmermare Date: Wed, 4 Oct 2023 18:00:08 +0300 Subject: [PATCH 2/2] Make style search work on all Unity versions --- Editor/DropdownStyle.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Editor/DropdownStyle.cs b/Editor/DropdownStyle.cs index 28febee..52484b1 100644 --- a/Editor/DropdownStyle.cs +++ b/Editor/DropdownStyle.cs @@ -53,12 +53,11 @@ public static GUIStyle SearchToolbarStyle { get { - #if UNITY_2022_3_OR_NEWER - const string styleName = "ToolbarSearchTextField"; - #else - const string styleName = "ToolbarSeachTextField"; - #endif - return _searchToolbarStyle ?? (_searchToolbarStyle = new GUIStyle(GUI.skin.FindStyle(styleName))); + if (_searchToolbarStyle == null) { + GUIStyle original = GUI.skin.FindStyle("ToolbarSearchTextField") ?? GUI.skin.FindStyle("ToolbarSeachTextField"); + _searchToolbarStyle = new GUIStyle(original); + } + return _searchToolbarStyle; } }