From 3532465e691066eb471735fb79abd6e90014224a Mon Sep 17 00:00:00 2001 From: max Date: Sat, 18 Apr 2020 22:55:52 +0200 Subject: [PATCH] Button labels, tooltips, icons. First iteration, buttons now have optional tooltips and labels. By default the editor will load with them on, this can be changed in the settings. --- .../Scripts/Data/Editor.meta | 8 ++ .../MA_TextureAtlasserProSettingsEditor.cs | 30 +++++ ..._TextureAtlasserProSettingsEditor.cs.meta} | 5 +- .../Data/MA_TextureAtlasserProSettings.cs | 19 ++- .../Utils/MA_TextureAtlasserProGuiLoader.cs | 115 ++++++++++++++++++ .../MA_TextureAtlasserProGuiLoader.cs.meta | 11 ++ .../Utils/MA_TextureAtlasserProIcons.cs | 37 ------ .../MA_TextureAtlasserProInspectorView.cs | 4 +- .../Views/MA_TextureAtlasserProMenuView.cs | 16 +-- .../Views/MA_TextureAtlasserProWorkView.cs | 6 +- .../MA_TextureAtlasserProExportWindow.cs | 2 +- .../Windows/MA_TextureAtlasserProWindow.cs | 3 +- 12 files changed, 200 insertions(+), 56 deletions(-) create mode 100644 Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor.meta create mode 100644 Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor/MA_TextureAtlasserProSettingsEditor.cs rename Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/{Editor/Utils/MA_TextureAtlasserProIcons.cs.meta => Data/Editor/MA_TextureAtlasserProSettingsEditor.cs.meta} (69%) create mode 100644 Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProGuiLoader.cs create mode 100644 Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProGuiLoader.cs.meta delete mode 100644 Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor.meta b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor.meta new file mode 100644 index 0000000..fc57c51 --- /dev/null +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34f8bb860cb13ac49ab6602f84a27dfd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor/MA_TextureAtlasserProSettingsEditor.cs b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor/MA_TextureAtlasserProSettingsEditor.cs new file mode 100644 index 0000000..335b99a --- /dev/null +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor/MA_TextureAtlasserProSettingsEditor.cs @@ -0,0 +1,30 @@ +#if UNITY_EDITOR +using UnityEditor; +using UnityEngine; + +namespace MA_TextureAtlasserPro +{ + [CustomEditor(typeof(MA_TextureAtlasserProSettings))] + [CanEditMultipleObjects] + public class MA_TextureAtlasserProSettingsEditor : Editor + { + GUIContent reloadButton = new GUIContent("Reload", "Update the editor with the changes made."); + + public override void OnInspectorGUI() + { + GUILayout.BeginVertical(); + DrawDefaultInspector(); + + GUILayout.Space(15); + + if(GUILayout.Button(reloadButton, GUILayout.Height(40), GUILayout.ExpandWidth(true))) + { + //Update necessary systems. + MA_TextureAtlasserProGuiLoader.LoadEditorGui((MA_TextureAtlasserProSettings)this.target); + } + + GUILayout.EndVertical(); + } + } +} +#endif \ No newline at end of file diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs.meta b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor/MA_TextureAtlasserProSettingsEditor.cs.meta similarity index 69% rename from Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs.meta rename to Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor/MA_TextureAtlasserProSettingsEditor.cs.meta index 28f1d0a..c5843c8 100644 --- a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs.meta +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/Editor/MA_TextureAtlasserProSettingsEditor.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 64b4bb2ec0d18b142b6a5aa0c8dfb5c1 -timeCreated: 1521838249 -licenseType: Free +guid: 9850f2b069cfb36498e9601e4884071a MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProSettings.cs b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProSettings.cs index 043dff5..fbecbf8 100644 --- a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProSettings.cs +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProSettings.cs @@ -10,7 +10,10 @@ namespace MA_TextureAtlasserPro [System.Serializable] public class MA_TextureAtlasserProSettings : ScriptableObject { - [Header("Hotkeys:")] + [Header("GUI (requires reload):")] + public MA_TextureAtlasserProGuiSettings editorGuiSettings = new MA_TextureAtlasserProGuiSettings(); + + [Header("HotKeys:")] public bool useHotkeys = false; public EventModifiers modifierKey = EventModifiers.Alt; public KeyCode addQuadHotKey = KeyCode.Q; @@ -36,5 +39,19 @@ namespace MA_TextureAtlasserPro return false; } } + + [System.Serializable] + public class MA_TextureAtlasserProGuiSettings + { + public MA_EditorGuiMode editorGuiMode = MA_EditorGuiMode.IconAndText; + public bool enableToolTips = true; + } + + public enum MA_EditorGuiMode + { + IconAndText = 0, + Icon = 1, + Text = 2 + } } #endif \ No newline at end of file diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProGuiLoader.cs b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProGuiLoader.cs new file mode 100644 index 0000000..6530c52 --- /dev/null +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProGuiLoader.cs @@ -0,0 +1,115 @@ +#if UNITY_EDITOR +using UnityEngine; +using UnityEditor; + +namespace MA_TextureAtlasserPro +{ + public static class MA_TextureAtlasserProGuiLoader + { + private const string LOADICONPATH = "Assets/MA_ToolBox/MA_TextureAtlasserPro/Icons/"; + + public static GUIContent createAtlasGC; + public static GUIContent loadAtlasGC; + public static GUIContent exportAtlasGC; + public static GUIContent createQuadGC; + public static GUIContent removeQuadGC; + public static GUIContent duplicateQuadGC; + public static GUIContent showTexturesOnGC; + public static GUIContent showTexturesOffGC; + public static GUIContent dragHandleGC; + public static GUIContent editGC; + public static GUIContent createExportSettingsGC; + + public static void LoadEditorGui(MA_TextureAtlasserProSettings settings) + { + createAtlasGC = new GUIContent(); + loadAtlasGC = new GUIContent(); + exportAtlasGC = new GUIContent(); + createQuadGC = new GUIContent(); + removeQuadGC = new GUIContent(); + duplicateQuadGC = new GUIContent(); + showTexturesOnGC = new GUIContent(); + showTexturesOffGC = new GUIContent(); + dragHandleGC = new GUIContent(); + editGC = new GUIContent(); + createExportSettingsGC = new GUIContent(); + + switch (settings.editorGuiSettings.editorGuiMode) + { + case MA_EditorGuiMode.IconAndText: + LoadIcons(); + LoadText(); + break; + case MA_EditorGuiMode.Icon: + LoadIcons(); + break; + case MA_EditorGuiMode.Text: + LoadText(); + break; + default: + LoadIcons(); + break; + } + + if(settings.editorGuiSettings.enableToolTips) + { + LoadToolTips(settings); + } + + //Exceptions. + dragHandleGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "dragHandleIcon" + ".png"); + dragHandleGC.text = ""; + editGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "editIcon" + ".png"); + editGC.text = ""; + } + + private static void LoadIcons() + { + createAtlasGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "createAtlasIcon" + ".png"); + loadAtlasGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "loadAtlasIcon" + ".png"); + exportAtlasGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "exportAtlasIcon" + ".png"); + createQuadGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "createQuadIcon" + ".png"); + removeQuadGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "removeQuadIcon" + ".png"); + duplicateQuadGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "duplicateQuadIcon" + ".png"); + showTexturesOnGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "showTexturesOnIcon" + ".png"); + showTexturesOffGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "showTexturesOffIcon" + ".png"); + createExportSettingsGC.image = (Texture)EditorGUIUtility.Load(LOADICONPATH + "createAtlasIcon" + ".png"); + } + + private static void LoadText() + { + createAtlasGC.text = "Create Atlas"; + loadAtlasGC.text = "Load Atlas"; + exportAtlasGC.text = "Export Atlas"; + createQuadGC.text = "Create Quad"; + removeQuadGC.text = "Remove Quad"; + duplicateQuadGC.text = "Duplicate Quad"; + showTexturesOnGC.text = "Hide Textures"; + showTexturesOffGC.text = "Show Textures"; + createExportSettingsGC.text = "Create Export Settings"; + } + + private static void LoadToolTips(MA_TextureAtlasserProSettings settings) + { + createAtlasGC.tooltip = "Opens the create atlas window."; + loadAtlasGC.tooltip = "Load an existing atlas."; + exportAtlasGC.tooltip = "Opens the export window."; + if (settings.useHotkeys) + { + createQuadGC.tooltip = string.Format("({0} + {1}), Creates a new quad.", settings.modifierKey, settings.addQuadHotKey); + removeQuadGC.tooltip = string.Format("({0} + {1}), Removes the selected quad.", settings.modifierKey, settings.removeQuadHotKey); + duplicateQuadGC.tooltip = string.Format("({0} + {1}), Duplicates the selected quad.", settings.modifierKey, settings.duplicateHotKey); + } + else + { + createQuadGC.tooltip = "Creates a new quad."; + removeQuadGC.tooltip = "Removes the selected quad."; + duplicateQuadGC.tooltip = "Duplicates the selected quad."; + } + showTexturesOnGC.tooltip = "Hides the preview of the first texture on the quads."; + showTexturesOffGC.tooltip = "Shows a preview of the first texture on the quads."; + createExportSettingsGC.tooltip = "Opens the create export settings window."; + } + } +} +#endif \ No newline at end of file diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProGuiLoader.cs.meta b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProGuiLoader.cs.meta new file mode 100644 index 0000000..a3b150d --- /dev/null +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProGuiLoader.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1547329de58c58d4eb6b272309da0c85 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs deleted file mode 100644 index 6d31fd3..0000000 --- a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs +++ /dev/null @@ -1,37 +0,0 @@ -#if UNITY_EDITOR -using UnityEngine; -using UnityEditor; - -namespace MA_TextureAtlasserPro -{ - public static class MA_TextureAtlasserProIcons - { - private const string LOADICONPATH = "Assets/MA_ToolBox/MA_TextureAtlasserPro/Icons/"; - - public static GUIContent createAtlasIcon; - public static GUIContent loadAtlasIcon; - public static GUIContent exportAtlasIcon; - public static GUIContent createQuadIcon; - public static GUIContent removeQuadIcon; - public static GUIContent duplicateQuadIcon; - public static GUIContent showTexturesOnIcon; - public static GUIContent showTexturesOffIcon; - public static GUIContent dragHandleIcon; - public static GUIContent editIcon; - - public static void LoadIcons() - { - createAtlasIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "createAtlasIcon" + ".png")); - loadAtlasIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "loadAtlasIcon" + ".png")); - exportAtlasIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "exportAtlasIcon" + ".png")); - createQuadIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "createQuadIcon" + ".png")); - removeQuadIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "removeQuadIcon" + ".png")); - duplicateQuadIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "duplicateQuadIcon" + ".png")); - showTexturesOnIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "showTexturesOnIcon" + ".png")); - showTexturesOffIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "showTexturesOffIcon" + ".png")); - dragHandleIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "dragHandleIcon" + ".png")); - editIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "editIcon" + ".png")); - } - } -} -#endif \ No newline at end of file diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs index 5ae3bce..4941278 100644 --- a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs @@ -63,7 +63,7 @@ namespace MA_TextureAtlasserPro //Textures GUILayout.BeginHorizontal(); GUILayout.Label("Textures", GUILayout.ExpandWidth(true)); - if(GUILayout.Button(MA_TextureAtlasserProIcons.editIcon, EditorStyles.miniButton, GUILayout.Width(36), GUILayout.Height(15))) + if(GUILayout.Button(MA_TextureAtlasserProGuiLoader.editGC, EditorStyles.miniButton, GUILayout.Width(36), GUILayout.Height(15))) { isEditing = !isEditing; } @@ -140,7 +140,7 @@ namespace MA_TextureAtlasserPro } else { - labelStyle.normal.textColor = Color.black; + labelStyle.normal.textColor = GUI.skin.label.normal.textColor; } GUILayout.Label("x " + curWindow.textureAtlas.selectedTextureQuad.guiRect.x.ToString() + ", y " + curWindow.textureAtlas.selectedTextureQuad.guiRect.y.ToString()); diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProMenuView.cs b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProMenuView.cs index 4020f32..05a5745 100644 --- a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProMenuView.cs +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProMenuView.cs @@ -25,42 +25,42 @@ namespace MA_TextureAtlasserPro GUILayout.BeginArea(editorViewRect, EditorStyles.helpBox); GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true)); - if(GUILayout.Button(MA_TextureAtlasserProIcons.createAtlasIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) + if(GUILayout.Button(MA_TextureAtlasserProGuiLoader.createAtlasGC, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) { MA_TextureAtlasserProCreateWindow.InitEditorWindow(curWindow); } - if(GUILayout.Button(MA_TextureAtlasserProIcons.loadAtlasIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) + if(GUILayout.Button(MA_TextureAtlasserProGuiLoader.loadAtlasGC, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) { curWindow.textureAtlas = MA_TextureAtlasserProUtils.LoadTextureAtlas(); } if(curWindow.textureAtlas != null) { - if(GUILayout.Button(MA_TextureAtlasserProIcons.exportAtlasIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) + if(GUILayout.Button(MA_TextureAtlasserProGuiLoader.exportAtlasGC, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) { MA_TextureAtlasserProExportWindow.InitEditorWindow(curWindow); //MA_TextureAtlasserProUtils.ExportAtlas(curWindow.textureAtlas); } GUILayout.Space(MA_TextureAtlasserProUtils.VIEW_OFFSET); - if(curWindow.textureAtlas.showTextures && GUILayout.Button(MA_TextureAtlasserProIcons.showTexturesOnIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) + if(curWindow.textureAtlas.showTextures && GUILayout.Button(MA_TextureAtlasserProGuiLoader.showTexturesOnGC, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) { curWindow.textureAtlas.showTextures = false; } - else if(!curWindow.textureAtlas.showTextures && GUILayout.Button(MA_TextureAtlasserProIcons.showTexturesOffIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) + else if(!curWindow.textureAtlas.showTextures && GUILayout.Button(MA_TextureAtlasserProGuiLoader.showTexturesOffGC, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) { curWindow.textureAtlas.showTextures = true; } GUILayout.Space(MA_TextureAtlasserProUtils.VIEW_OFFSET); - if(GUILayout.Button(MA_TextureAtlasserProIcons.createQuadIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) + if(GUILayout.Button(MA_TextureAtlasserProGuiLoader.createQuadGC, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) { MA_TextureAtlasserProUtils.CreateTextureQuad(curWindow.textureAtlas, "new Quad", new Rect(0, 0, 128, 128), curWindow.settings.autoFocus); } - if(curWindow.textureAtlas.selectedTextureQuad != null && GUILayout.Button(MA_TextureAtlasserProIcons.removeQuadIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) + if(curWindow.textureAtlas.selectedTextureQuad != null && GUILayout.Button(MA_TextureAtlasserProGuiLoader.removeQuadGC, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) { if(curWindow.textureAtlas.selectedTextureQuad != null) MA_TextureAtlasserProUtils.RemoveTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus); } - if (curWindow.textureAtlas.selectedTextureQuad != null && GUILayout.Button(MA_TextureAtlasserProIcons.duplicateQuadIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) + if (curWindow.textureAtlas.selectedTextureQuad != null && GUILayout.Button(MA_TextureAtlasserProGuiLoader.duplicateQuadGC, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) { if (curWindow.textureAtlas.selectedTextureQuad != null) MA_TextureAtlasserProUtils.DuplicateTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus, curWindow.settings.copySelectedQuadData, curWindow.settings.duplicatedQuadNamePrefix); diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProWorkView.cs b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProWorkView.cs index ba55221..2fe4067 100644 --- a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProWorkView.cs +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProWorkView.cs @@ -145,9 +145,9 @@ namespace MA_TextureAtlasserPro { if(q.isSelected) { - GUI.Button(new Rect(q.dragRectPos.x, q.dragRectPos.y, q.dragRectPos.width, q.dragRectPos.height), MA_TextureAtlasserProIcons.dragHandleIcon); - GUI.Button(new Rect(q.dragRectWidth.x, q.dragRectWidth.y, q.dragRectWidth.width, q.dragRectWidth.height), MA_TextureAtlasserProIcons.dragHandleIcon); - GUI.Button(new Rect(q.dragRectHeight.x, q.dragRectHeight.y, q.dragRectHeight.width, q.dragRectHeight.height), MA_TextureAtlasserProIcons.dragHandleIcon); + GUI.Button(new Rect(q.dragRectPos.x, q.dragRectPos.y, q.dragRectPos.width, q.dragRectPos.height), MA_TextureAtlasserProGuiLoader.dragHandleGC); + GUI.Button(new Rect(q.dragRectWidth.x, q.dragRectWidth.y, q.dragRectWidth.width, q.dragRectWidth.height), MA_TextureAtlasserProGuiLoader.dragHandleGC); + GUI.Button(new Rect(q.dragRectHeight.x, q.dragRectHeight.y, q.dragRectHeight.width, q.dragRectHeight.height), MA_TextureAtlasserProGuiLoader.dragHandleGC); } } } diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProExportWindow.cs b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProExportWindow.cs index e0f381c..fb41570 100644 --- a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProExportWindow.cs +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProExportWindow.cs @@ -136,7 +136,7 @@ namespace MA_TextureAtlasserPro { GUILayout.BeginHorizontal(EditorStyles.helpBox, GUILayout.Height(44)); - if (GUILayout.Button(MA_TextureAtlasserProIcons.createAtlasIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) + if (GUILayout.Button(MA_TextureAtlasserProGuiLoader.createExportSettingsGC, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true))) { MA_TextureAtlasserProCreateExportWindow.InitWindow(curWindow); } diff --git a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProWindow.cs b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProWindow.cs index c5f9997..2605e73 100644 --- a/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProWindow.cs +++ b/Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProWindow.cs @@ -34,7 +34,7 @@ namespace MA_TextureAtlasserPro private void OnEnable() { //Load the icons - MA_TextureAtlasserProIcons.LoadIcons(); + //MA_TextureAtlasserProGuiLoader.LoadEditorGui(thisWindow.settings.editorGuiSettings); } private static void GetCurrentWindow() @@ -59,6 +59,7 @@ namespace MA_TextureAtlasserPro } thisWindow.settings = MA_TextureAtlasserProUtils.LoadSettings(); + MA_TextureAtlasserProGuiLoader.LoadEditorGui(thisWindow.settings); thisWindow.workView = new MA_TextureAtlasserProWorkView(thisWindow, "workView"); thisWindow.menuView = new MA_TextureAtlasserProMenuView(thisWindow, "menuView"); thisWindow.inspectorView = new MA_TextureAtlasserProInspectorView(thisWindow, "inspectorView");