Skip to content

Commit fc5c6af

Browse files
committed
feat: Optimized UI & Cleanup code
1 parent 8586600 commit fc5c6af

File tree

6 files changed

+22
-78
lines changed

6 files changed

+22
-78
lines changed

Editor/Scripts/AssetItemView.cs

Lines changed: 14 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ public AssetItemView()
7878
style =
7979
{
8080
flexShrink = 0,
81-
width = 24,
82-
height = 24,
81+
alignSelf = Align.Center,
82+
width = 16,
83+
height = 16,
84+
marginLeft = 4,
8385
}
8486
};
8587
_container.Add(_assetIcon);
@@ -125,7 +127,7 @@ public void Bind(AssetHandle target)
125127
case AssetCategory.ExternalFile:
126128
string path = AssetHandle.GetAssetPath();
127129
assetIconTex = File.Exists(path) || Directory.Exists(path)
128-
? GetExternalFileTexture(false)
130+
? GetExternalFileTexture()
129131
: GetWarningTexture();
130132
break;
131133

@@ -301,15 +303,7 @@ private void ShowMenuItemContextMenu(Vector2 mousePosition)
301303
}
302304

303305

304-
#region Static Textures
305-
306-
private static Texture _sceneObjectTextureCache;
307-
private static Texture _sceneObjectTextureSmallCache;
308-
private static Texture _externalFileTextureCache;
309-
private static Texture _externalFileTextureSmallCache;
310-
private static Texture _urlTextureCache;
311-
private static Texture _menuItemTextureCache;
312-
private static Texture _warningTextureCache;
306+
#region Get Textures
313307

314308
private static Texture GetObjectIcon(UObject obj, SceneAsset containingScene)
315309
{
@@ -330,86 +324,35 @@ private static Texture GetObjectIcon(UObject obj, SceneAsset containingScene)
330324
}
331325
}
332326

333-
return GetSceneObjectTexture(false);
327+
return GetSceneObjectTexture();
334328
}
335329

336330
return GetWarningTexture();
337331
}
338332

339-
private static Texture GetSceneObjectTexture(bool small)
333+
private static Texture GetSceneObjectTexture()
340334
{
341-
if (small)
342-
{
343-
if (!_sceneObjectTextureSmallCache)
344-
{
345-
_sceneObjectTextureSmallCache = (Texture)EditorGUIUtility.Load(
346-
EditorGUIUtility.isProSkin
347-
? "d_UnityEditor.SceneHierarchyWindow"
348-
: "UnityEditor.SceneHierarchyWindow");
349-
}
350-
351-
return _sceneObjectTextureSmallCache;
352-
}
353-
354-
if (!_sceneObjectTextureCache)
355-
{
356-
_sceneObjectTextureCache = (Texture)EditorGUIUtility.Load(
357-
EditorGUIUtility.isProSkin
358-
? "d_UnityEditor.SceneHierarchyWindow@2x"
359-
: "UnityEditor.SceneHierarchyWindow@2x");
360-
}
361-
362-
return _sceneObjectTextureCache;
335+
return EditorGUIUtility.IconContent("UnityEditor.SceneHierarchyWindow").image;
363336
}
364337

365-
private static Texture GetExternalFileTexture(bool small)
338+
private static Texture GetExternalFileTexture()
366339
{
367-
if (small)
368-
{
369-
if (!_externalFileTextureSmallCache)
370-
{
371-
_externalFileTextureSmallCache = (Texture)EditorGUIUtility.Load(EditorGUIUtility.isProSkin ? "d_Import" : "Import");
372-
}
373-
374-
return _externalFileTextureSmallCache;
375-
}
376-
377-
if (!_externalFileTextureCache)
378-
{
379-
_externalFileTextureCache = (Texture)EditorGUIUtility.Load(EditorGUIUtility.isProSkin ? "d_Import@2x" : "Import@2x");
380-
}
381-
382-
return _externalFileTextureCache;
340+
return EditorGUIUtility.IconContent("Import").image;
383341
}
384342

385343
private static Texture GetUrlTexture()
386344
{
387-
if (!_urlTextureCache)
388-
{
389-
_urlTextureCache = (Texture)EditorGUIUtility.Load(EditorGUIUtility.isProSkin ? "d_BuildSettings.Web.Small" : "BuildSettings.Web.Small");
390-
}
391-
392-
return _urlTextureCache;
345+
return EditorGUIUtility.IconContent("BuildSettings.Web.Small").image;
393346
}
394347

395348
private static Texture GetMenuItemTexture()
396349
{
397-
if (!_menuItemTextureCache)
398-
{
399-
_menuItemTextureCache = (Texture)EditorGUIUtility.Load(EditorGUIUtility.isProSkin ? "d_PlayButton@2x" : "PlayButton@2x");
400-
}
401-
402-
return _menuItemTextureCache;
350+
return EditorGUIUtility.IconContent("PlayButton").image;
403351
}
404352

405353
private static Texture GetWarningTexture()
406354
{
407-
if (!_warningTextureCache)
408-
{
409-
_warningTextureCache = (Texture)EditorGUIUtility.Load("Warning@2x");
410-
}
411-
412-
return _warningTextureCache;
355+
return EditorGUIUtility.IconContent("Warning").image;
413356
}
414357

415358
#endregion

Editor/Scripts/AssetQuickAccessWindow.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ private void OnEnable()
148148
{
149149
_instance = this;
150150

151-
titleContent = EditorGUIUtility.IconContent(
152-
EditorGUIUtility.isProSkin ? "d_Favorite" : "Favorite");
151+
titleContent = EditorGUIUtility.IconContent("Favorite");
153152
titleContent.text = "Asset Quick Access";
154153
minSize = new Vector2(260, 180);
155154

@@ -198,7 +197,7 @@ private void OnFocus()
198197

199198
private void ShowButton(Rect pos)
200199
{
201-
if (GUI.Button(pos, EditorGUIUtility.IconContent("_Help"), GUI.skin.FindStyle("IconButton")))
200+
if (GUI.Button(pos, EditorGUIUtility.IconContent("_Help"), EditorStyles.iconButton))
202201
{
203202
Application.OpenURL("https://github.com/SolarianZ/UnityAssetQuickAccessTool");
204203
}

Editor/Scripts/UrlEditWindow.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,9 @@ private static Color GetTextColor(bool isErrorText)
336336
return new Color32(200, 0, 0, 255);
337337
}
338338

339-
return EditorGUIUtility.isProSkin ? new Color32(196, 196, 196, 255) : new Color32(24, 24, 24, 255);
339+
return EditorGUIUtility.isProSkin
340+
? new Color32(196, 196, 196, 255)
341+
: new Color32(24, 24, 24, 255);
340342
}
341343

342344
//public static async Task<string> GetWebsiteTitleAsync(string url)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Pin frequently used **Unity objects, menu items and external files/folders/urls*
2525

2626
Unity 2021.3 and later.
2727

28-
For Unity 2019.2 - Unity 2021.2, please use version [v1.4.1](https://github.com/SolarianZ/UnityAssetQuickAccessTool/releases/tag/v1.4.1).
28+
For Unity 2019.2 - Unity 2021.2, please use version [v1.4.2](https://github.com/SolarianZ/UnityAssetQuickAccessTool/releases/tag/v1.4.2).<br/>
2929
For Unity 2017.4 - Unity 2019.1, please use version [v1.2.1](https://github.com/SolarianZ/UnityAssetQuickAccessTool/releases/tag/v1.2.1).
3030

3131
## Installation

README_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
Unity 2021.3 或更新版本。
2727

28-
Unity 2019.2 - Unity 2021.2请使用 [v1.4.1](https://github.com/SolarianZ/UnityAssetQuickAccessTool/releases/tag/v1.4.1) 版本。
28+
Unity 2019.2 - Unity 2021.2请使用 [v1.4.2](https://github.com/SolarianZ/UnityAssetQuickAccessTool/releases/tag/v1.4.2) 版本。<br/>
2929
Unity 2017.4 - Unity 2019.1请使用 [v1.2.1](https://github.com/SolarianZ/UnityAssetQuickAccessTool/releases/tag/v1.2.1) 版本。
3030

3131
## 安装

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.greenbamboogames.assetquickaccess",
3-
"version": "3.3.1",
3+
"version": "3.3.2",
44
"displayName": "Asset Quick Access!",
55
"description": "Pin frequently used objects to a separate editor window. An enhanced version of Unity's Favorites feature.",
66
"unity": "2021.3",

0 commit comments

Comments
 (0)