diff --git a/src/StudioCore/AssetBrowser/AssetBrowserScreen.cs b/src/StudioCore/AssetBrowser/AssetBrowserScreen.cs index 3eab16ef5..6cbfd6471 100644 --- a/src/StudioCore/AssetBrowser/AssetBrowserScreen.cs +++ b/src/StudioCore/AssetBrowser/AssetBrowserScreen.cs @@ -4,7 +4,7 @@ using StudioCore.Banks.AliasBank; using StudioCore.Editor; using StudioCore.Gui; -using StudioCore.Interface; +using StudioCore.Editor; using StudioCore.MsbEditor; using StudioCore.Platform; using StudioCore.Scene; @@ -218,7 +218,7 @@ public void OnGui() if (ImGui.Begin($@"Asset Browser: Category##{SourceType}AssetBrowser_CategoryList")) { ImGui.Separator(); - ImguiUtils.WrappedText("Categories:"); + Editor.EditorDecorations.WrappedText("Categories:"); ImGui.Separator(); DisplayCategoryList(); @@ -235,7 +235,7 @@ public void OnGui() DisplayTopSection(); ImGui.Separator(); - ImguiUtils.WrappedText("Assets:"); + Editor.EditorDecorations.WrappedText("Assets:"); ImGui.Separator(); DisplayBrowserList(AssetCategoryType.Character, _characterNameCache, chrReferenceDict); @@ -255,7 +255,7 @@ public void OnGui() ImGui.Indent(10.0f); ImGui.Separator(); - ImguiUtils.WrappedText("Actions:"); + Editor.EditorDecorations.WrappedText("Actions:"); ImGui.Separator(); if (SourceType == AssetBrowserSource.MapEditor) @@ -283,7 +283,7 @@ private void DisplayTopSection() { ImGui.Separator(); ImGui.InputText($"Search", ref _searchInput, 255); - ImguiUtils.ShowHoverTooltip("Separate terms are split via the + character."); + Editor.EditorDecorations.ShowHoverTooltip("Separate terms are split via the + character."); } private void DisplayCategoryList() @@ -327,7 +327,7 @@ private void DisplayCategoryList() if (CFG.Current.AssetBrowser_ShowAliasesInBrowser) { var labelName = AliasUtils.GetMapNameAlias(mapId); - AliasUtils.DisplayAlias(labelName); + EditorDecorations.DisplayAlias(labelName); } } } @@ -393,14 +393,14 @@ private void DisplayBrowserList(AssetCategoryType assetType, List nameCa if (CFG.Current.AssetBrowser_ShowAliasesInBrowser) { var aliasName = referenceDict[lowerName].name; - AliasUtils.DisplayAlias(aliasName); + EditorDecorations.DisplayAlias(aliasName); } // Tags if (CFG.Current.AssetBrowser_ShowTagsInBrowser) { var tagString = string.Join(" ", referenceDict[lowerName].tags); - AliasUtils.DisplayTagAlias(tagString); + EditorDecorations.DisplayTagAlias(tagString); } } } @@ -462,14 +462,14 @@ private void DisplayBrowserList_MapPiece(AssetCategoryType assetType, Dictionary if (CFG.Current.AssetBrowser_ShowAliasesInBrowser) { var aliasName = referenceDict[lowerName].name; - AliasUtils.DisplayAlias(aliasName); + EditorDecorations.DisplayAlias(aliasName); } // Tags if (CFG.Current.AssetBrowser_ShowTagsInBrowser) { var tagString = string.Join(" ", referenceDict[lowerName].tags); - AliasUtils.DisplayTagAlias(tagString); + EditorDecorations.DisplayTagAlias(tagString); } } } @@ -483,41 +483,41 @@ private void DisplayActions_MapEditor() if (_selectedName == null || _selectedName == "") return; - ImguiUtils.WrappedText("Apply the selected asset attributes to your current object selection."); - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.WrappedText("Apply the selected asset attributes to your current object selection."); + Editor.EditorDecorations.WrappedText(""); ImGui.Checkbox("Update Name of Selected Object", ref CFG.Current.AssetBrowser_UpdateName); - ImguiUtils.ShowHoverTooltip("Update the Name property of the selected entity when it is changed to a selected asset."); + Editor.EditorDecorations.ShowHoverTooltip("Update the Name property of the selected entity when it is changed to a selected asset."); if (Locator.AssetLocator.Type is GameType.EldenRing or GameType.ArmoredCoreVI) { ImGui.Checkbox("Update Instance ID of Selected Object", ref CFG.Current.AssetBrowser_UpdateInstanceID); - ImguiUtils.ShowHoverTooltip("Update the Name property of the selected entity when it is changed to a selected asset."); - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.ShowHoverTooltip("Update the Name property of the selected entity when it is changed to a selected asset."); + Editor.EditorDecorations.WrappedText(""); } if (ImGui.Button("Apply##action_Asset_Apply", new Vector2(200, 32))) { ApplyMapAssetSelection(); } - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.WrappedText(""); ImGui.Separator(); - ImguiUtils.WrappedText("Alias:"); + Editor.EditorDecorations.WrappedText("Alias:"); ImGui.Separator(); - ImguiUtils.WrappedText("Update the stored name and tag list for the selected asset here."); - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.WrappedText("Update the stored name and tag list for the selected asset here."); + Editor.EditorDecorations.WrappedText(""); - ImguiUtils.WrappedText("Name:"); + Editor.EditorDecorations.WrappedText("Name:"); ImGui.InputText($"##Name", ref _refUpdateName, 255); - ImguiUtils.ShowHoverTooltip("Alias name given to this asset."); - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.ShowHoverTooltip("Alias name given to this asset."); + Editor.EditorDecorations.WrappedText(""); - ImguiUtils.WrappedText("Tags:"); + Editor.EditorDecorations.WrappedText("Tags:"); ImGui.InputText($"##Tags", ref _refUpdateTags, 255); - ImguiUtils.ShowHoverTooltip("Tags associated with this asset. Tags are separated with the , character."); - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.ShowHoverTooltip("Tags associated with this asset. Tags are separated with the , character."); + Editor.EditorDecorations.WrappedText(""); if (ImGui.Button("Update##action_AssetAlias_Update", new Vector2(200, 32))) { @@ -535,31 +535,31 @@ private void DisplayActions_ModelEditor() if (_selectedName == null || _selectedName == "") return; - ImguiUtils.WrappedText("Load the selected asset."); - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.WrappedText("Load the selected asset."); + Editor.EditorDecorations.WrappedText(""); if (ImGui.Button("Load##action_Asset_Load", new Vector2(200, 32))) { LoadModelAssetSelection(); } - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.WrappedText(""); ImGui.Separator(); - ImguiUtils.WrappedText("Alias:"); + Editor.EditorDecorations.WrappedText("Alias:"); ImGui.Separator(); - ImguiUtils.WrappedText("Update the stored name and tag list for the selected asset here."); - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.WrappedText("Update the stored name and tag list for the selected asset here."); + Editor.EditorDecorations.WrappedText(""); - ImguiUtils.WrappedText("Name:"); + Editor.EditorDecorations.WrappedText("Name:"); ImGui.InputText($"##Name", ref _refUpdateName, 255); - ImguiUtils.ShowHoverTooltip("Alias name given to this asset."); - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.ShowHoverTooltip("Alias name given to this asset."); + Editor.EditorDecorations.WrappedText(""); - ImguiUtils.WrappedText("Tags:"); + Editor.EditorDecorations.WrappedText("Tags:"); ImGui.InputText($"##Tags", ref _refUpdateTags, 255); - ImguiUtils.ShowHoverTooltip("Tags associated with this asset. Tags are separated with the , character."); - ImguiUtils.WrappedText(""); + Editor.EditorDecorations.ShowHoverTooltip("Tags associated with this asset. Tags are separated with the , character."); + Editor.EditorDecorations.WrappedText(""); if (ImGui.Button("Update##action_AssetAlias_Update", new Vector2(200, 32))) { diff --git a/src/StudioCore/Interface/AliasUtils.cs b/src/StudioCore/Banks/AliasBank/AliasUtils.cs similarity index 93% rename from src/StudioCore/Interface/AliasUtils.cs rename to src/StudioCore/Banks/AliasBank/AliasUtils.cs index 01906485d..0bf97c36d 100644 --- a/src/StudioCore/Interface/AliasUtils.cs +++ b/src/StudioCore/Banks/AliasBank/AliasUtils.cs @@ -14,30 +14,9 @@ using System.Threading.Tasks; using static Andre.Native.ImGuiBindings; -namespace StudioCore.Interface; +namespace StudioCore.Banks.AliasBank; public static class AliasUtils { - public static void DisplayAlias(string aliasName) - { - if (aliasName != "") - { - ImGui.SameLine(); - ImGui.PushTextWrapPos(0); - ImGui.TextColored(new Vector4(1.0f, 1.0f, 0.0f, 1.0f), @$"{aliasName}"); - ImGui.PopTextWrapPos(); - } - } - public static void DisplayTagAlias(string aliasName) - { - if (aliasName != "") - { - ImGui.SameLine(); - ImGui.PushTextWrapPos(0); - ImGui.TextColored(new Vector4(0.0f, 1.0f, 0.0f, 1.0f), @$"[{aliasName}]"); - ImGui.PopTextWrapPos(); - } - } - public static string GetTagListString(List refTagList) { var tagListStr = ""; diff --git a/src/StudioCore/Editor/EditorDecorations.cs b/src/StudioCore/Editor/EditorDecorations.cs index 5c8c06dd1..c06bcad1b 100644 --- a/src/StudioCore/Editor/EditorDecorations.cs +++ b/src/StudioCore/Editor/EditorDecorations.cs @@ -924,5 +924,153 @@ public static void ImGui_DisplayPropertyInfo(Type propType, string fieldName, st } ImGui.Separator(); + } + public static unsafe void ShowMenuIcon(string iconStr) + { + ImGui.PushStyleVarVec2(ImGuiStyleVar.ItemSpacing, new Vector2(0, ImGui.GetStyle()->ItemSpacing.Y)); + ImGui.TextUnformatted(iconStr); + ImGui.PopStyleVar(1); + ImGui.SameLine(); + } + + public static unsafe void ShowActiveStatus(bool isActive) + { + if (isActive) + { + ImGui.SameLine(); + ImGui.PushStyleVarVec2(ImGuiStyleVar.ItemSpacing, new Vector2(0, ImGui.GetStyle()->ItemSpacing.Y)); + ImGui.TextUnformatted($"{ForkAwesome.CheckSquare}"); + ImGui.PopStyleVar(1); + } + else + { + ImGui.SameLine(); + ImGui.PushStyleVarVec2(ImGuiStyleVar.ItemSpacing, new Vector2(0, ImGui.GetStyle()->ItemSpacing.Y)); + ImGui.TextUnformatted($"{ForkAwesome.Square}"); + ImGui.PopStyleVar(1); + } + } + + public static void ShowHelpButton(string title, string desc, string id) + { + if (ImGui.Button($"{title}")) + ImGui.OpenPopup($"##{id}HelpPopup"); + + if (ImGui.BeginPopup($"##{id}HelpPopup")) + { + ImGui.Text($"{desc}"); + ImGui.EndPopup(); + } } + + public static void ShowHelpMarker(string desc) + { + if (CFG.Current.ShowUITooltips) + { + ImGui.SameLine(); + ImGui.TextDisabled("(?)"); + if (ImGui.IsItemHovered(0)) + { + ImGui.BeginTooltip(); + ImGui.PushTextWrapPos(450.0f); + ImGui.TextUnformatted(desc); + ImGui.PopTextWrapPos(); + ImGui.EndTooltip(); + } + } + } + + public static void ShowButtonTooltip(string desc) + { + if (CFG.Current.ShowUITooltips) + { + if (ImGui.IsItemHovered(0)) + { + ImGui.BeginTooltip(); + ImGui.PushTextWrapPos(450.0f); + ImGui.TextUnformatted(desc); + ImGui.PopTextWrapPos(); + ImGui.EndTooltip(); + } + } + } + + public static void ShowHoverTooltip(string desc) + { + if (CFG.Current.ShowUITooltips) + { + if (ImGui.IsItemHovered(0)) + { + ImGui.BeginTooltip(); + ImGui.PushTextWrapPos(450.0f); + ImGui.TextUnformatted(desc); + ImGui.PopTextWrapPos(); + ImGui.EndTooltip(); + } + } + } + + public static void ShowWideHoverTooltip(string desc) + { + if (CFG.Current.ShowUITooltips) + { + if (ImGui.IsItemHovered(0)) + { + ImGui.BeginTooltip(); + ImGui.PushTextWrapPos(800.0f); + ImGui.TextUnformatted(desc); + ImGui.PopTextWrapPos(); + ImGui.EndTooltip(); + } + } + } + + public static string GetKeybindHint(string hint) + { + if (hint == "") + return "None"; + else + return hint; + } + + public static void WrappedText(string text) + { + var size = ImGui.GetWindowSize(); + + ImGui.PushTextWrapPos(size.X); + ImGui.TextUnformatted(text); + ImGui.PopTextWrapPos(); + } + + public static void WrappedTextColored(Vector4 color, string text) + { + var size = ImGui.GetWindowSize(); + + ImGui.PushTextWrapPos(size.X); + ImGui.PushStyleColorVec4(ImGuiCol.Text, color); + ImGui.TextUnformatted(text); + ImGui.PopStyleColor(1); + ImGui.PopTextWrapPos(); + } + public static void DisplayAlias(string aliasName) + { + if (aliasName != "") + { + ImGui.SameLine(); + ImGui.PushTextWrapPos(0); + ImGui.TextColored(new Vector4(1.0f, 1.0f, 0.0f, 1.0f), @$"{aliasName}"); + ImGui.PopTextWrapPos(); + } + } + public static void DisplayTagAlias(string aliasName) + { + if (aliasName != "") + { + ImGui.SameLine(); + ImGui.PushTextWrapPos(0); + ImGui.TextColored(new Vector4(0.0f, 1.0f, 0.0f, 1.0f), @$"[{aliasName}]"); + ImGui.PopTextWrapPos(); + } + } + } diff --git a/src/StudioCore/Interface/HelpWindow.cs b/src/StudioCore/Editor/HelpWindow.cs similarity index 95% rename from src/StudioCore/Interface/HelpWindow.cs rename to src/StudioCore/Editor/HelpWindow.cs index 0f2e01103..e28f346d3 100644 --- a/src/StudioCore/Interface/HelpWindow.cs +++ b/src/StudioCore/Editor/HelpWindow.cs @@ -8,7 +8,7 @@ using System.Text.RegularExpressions; using static Andre.Native.ImGuiBindings; -namespace StudioCore.Interface; +namespace StudioCore.Editor; public class HelpWindow { @@ -300,9 +300,9 @@ private void DisplayHelpSection(List entries, string name, string tab // No selection if (entry == null) { - ImguiUtils.WrappedText($"No {descName} selected"); + EditorDecorations.WrappedText($"No {descName} selected"); ImGui.Separator(); - ImguiUtils.WrappedText(""); + EditorDecorations.WrappedText(""); } // Selection else @@ -341,11 +341,11 @@ private void ProcessText(HelpEntry entry, string textLine) if (entry.HeaderColor != null) { Vector4 color = new Vector4(entry.HeaderColor[0], entry.HeaderColor[1], entry.HeaderColor[2], entry.HeaderColor[3]); - ImguiUtils.WrappedTextColored(color, outputLine); + EditorDecorations.WrappedTextColored(color, outputLine); } else { - ImguiUtils.WrappedText(outputLine); + EditorDecorations.WrappedText(outputLine); } ImGui.Separator(); @@ -364,17 +364,17 @@ private void ProcessText(HelpEntry entry, string textLine) if (entry.HighlightColor != null) { Vector4 color = new Vector4(entry.HighlightColor[0], entry.HighlightColor[1], entry.HighlightColor[2], entry.HighlightColor[3]); - ImguiUtils.WrappedTextColored(color, highlightText); + EditorDecorations.WrappedTextColored(color, highlightText); var offset = highlightText.Length * 8.0f; ImGui.SameLine(offset, 0); - ImguiUtils.WrappedText(otherText); + EditorDecorations.WrappedText(otherText); } else { - ImguiUtils.WrappedText(highlightText); + EditorDecorations.WrappedText(highlightText); ImGui.SameLine(); - ImguiUtils.WrappedText(otherText); + EditorDecorations.WrappedText(otherText); } } } @@ -399,7 +399,7 @@ private void ProcessText(HelpEntry entry, string textLine) // Default else { - ImguiUtils.WrappedText(textLine); + EditorDecorations.WrappedText(textLine); } } } diff --git a/src/StudioCore/Editor/CacheBank.cs b/src/StudioCore/Editor/UICache.cs similarity index 100% rename from src/StudioCore/Editor/CacheBank.cs rename to src/StudioCore/Editor/UICache.cs diff --git a/src/StudioCore/Interface/ImguiUtils.cs b/src/StudioCore/Interface/ImguiUtils.cs deleted file mode 100644 index bf2265992..000000000 --- a/src/StudioCore/Interface/ImguiUtils.cs +++ /dev/null @@ -1,139 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Numerics; -using System.Text; -using System.Threading.Tasks; -using static Andre.Native.ImGuiBindings; - -namespace StudioCore.Interface; -public static class ImguiUtils -{ - public static unsafe void ShowMenuIcon(string iconStr) - { - ImGui.PushStyleVarVec2(ImGuiStyleVar.ItemSpacing, new Vector2(0, ImGui.GetStyle()->ItemSpacing.Y)); - ImGui.TextUnformatted(iconStr); - ImGui.PopStyleVar(1); - ImGui.SameLine(); - } - - public static unsafe void ShowActiveStatus(bool isActive) - { - if (isActive) - { - ImGui.SameLine(); - ImGui.PushStyleVarVec2(ImGuiStyleVar.ItemSpacing, new Vector2(0, ImGui.GetStyle()->ItemSpacing.Y)); - ImGui.TextUnformatted($"{ForkAwesome.CheckSquare}"); - ImGui.PopStyleVar(1); - } - else - { - ImGui.SameLine(); - ImGui.PushStyleVarVec2(ImGuiStyleVar.ItemSpacing, new Vector2(0, ImGui.GetStyle()->ItemSpacing.Y)); - ImGui.TextUnformatted($"{ForkAwesome.Square}"); - ImGui.PopStyleVar(1); - } - } - - public static void ShowHelpButton(string title, string desc, string id) - { - if (ImGui.Button($"{title}")) - ImGui.OpenPopup($"##{id}HelpPopup"); - - if (ImGui.BeginPopup($"##{id}HelpPopup")) - { - ImGui.Text($"{desc}"); - ImGui.EndPopup(); - } - } - - public static void ShowHelpMarker(string desc) - { - if (CFG.Current.ShowUITooltips) - { - ImGui.SameLine(); - ImGui.TextDisabled("(?)"); - if (ImGui.IsItemHovered(0)) - { - ImGui.BeginTooltip(); - ImGui.PushTextWrapPos(450.0f); - ImGui.TextUnformatted(desc); - ImGui.PopTextWrapPos(); - ImGui.EndTooltip(); - } - } - } - - public static void ShowButtonTooltip(string desc) - { - if (CFG.Current.ShowUITooltips) - { - if (ImGui.IsItemHovered(0)) - { - ImGui.BeginTooltip(); - ImGui.PushTextWrapPos(450.0f); - ImGui.TextUnformatted(desc); - ImGui.PopTextWrapPos(); - ImGui.EndTooltip(); - } - } - } - - public static void ShowHoverTooltip(string desc) - { - if (CFG.Current.ShowUITooltips) - { - if (ImGui.IsItemHovered(0)) - { - ImGui.BeginTooltip(); - ImGui.PushTextWrapPos(450.0f); - ImGui.TextUnformatted(desc); - ImGui.PopTextWrapPos(); - ImGui.EndTooltip(); - } - } - } - - public static void ShowWideHoverTooltip(string desc) - { - if (CFG.Current.ShowUITooltips) - { - if (ImGui.IsItemHovered(0)) - { - ImGui.BeginTooltip(); - ImGui.PushTextWrapPos(800.0f); - ImGui.TextUnformatted(desc); - ImGui.PopTextWrapPos(); - ImGui.EndTooltip(); - } - } - } - - public static string GetKeybindHint(string hint) - { - if (hint == "") - return "None"; - else - return hint; - } - - public static void WrappedText(string text) - { - var size = ImGui.GetWindowSize(); - - ImGui.PushTextWrapPos(size.X); - ImGui.TextUnformatted(text); - ImGui.PopTextWrapPos(); - } - - public static void WrappedTextColored(Vector4 color, string text) - { - var size = ImGui.GetWindowSize(); - - ImGui.PushTextWrapPos(size.X); - ImGui.PushStyleColorVec4(ImGuiCol.Text, color); - ImGui.TextUnformatted(text); - ImGui.PopStyleColor(1); - ImGui.PopTextWrapPos(); - } -} diff --git a/src/StudioCore/MapStudioNew.cs b/src/StudioCore/MapStudioNew.cs index b3c86e976..03ae7de14 100644 --- a/src/StudioCore/MapStudioNew.cs +++ b/src/StudioCore/MapStudioNew.cs @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; using Veldrid; using Veldrid.Sdl2; -using StudioCore.Interface; +using StudioCore.Editor; using StudioCore.Utilities; using Renderer = StudioCore.Scene.Renderer; using Thread = System.Threading.Thread; diff --git a/src/StudioCore/MsbEditor/SceneTree.cs b/src/StudioCore/MsbEditor/SceneTree.cs index 04dae0f4c..b9b2ffac6 100644 --- a/src/StudioCore/MsbEditor/SceneTree.cs +++ b/src/StudioCore/MsbEditor/SceneTree.cs @@ -14,7 +14,8 @@ using System.Numerics; using System.Runtime.InteropServices; using Veldrid; -using StudioCore.Interface; +using StudioCore.Editor; +using StudioCore.Banks.AliasBank; namespace StudioCore.MsbEditor; @@ -272,7 +273,7 @@ private unsafe void MapObjectSelectable(Entity e, bool visicon, bool hierarchial } var alias = AliasUtils.GetEntityAliasName(e); - AliasUtils.DisplayAlias(alias); + EditorDecorations.DisplayAlias(alias); } if (ImGui.IsItemClicked()) @@ -713,7 +714,7 @@ public unsafe void OnGui() if (CFG.Current.MapEditor_MapObjectList_ShowMapNames) { - AliasUtils.DisplayAlias(aliasName); + EditorDecorations.DisplayAlias(aliasName); } ImGui.EndGroup(); diff --git a/src/StudioCore/SettingsMenu.cs b/src/StudioCore/SettingsMenu.cs index c741aa355..99b65a56f 100644 --- a/src/StudioCore/SettingsMenu.cs +++ b/src/StudioCore/SettingsMenu.cs @@ -12,7 +12,7 @@ using System.Numerics; using System.Reflection; using Veldrid; -using StudioCore.Interface; +using StudioCore.Editor; using System.Globalization; namespace StudioCore; @@ -160,7 +160,7 @@ private void DisplaySettings_System() if (ImGui.CollapsingHeader("Resources", ImGuiTreeNodeFlags.DefaultOpen)) { ImGui.Checkbox("Alias Banks - Editor Mode", ref CFG.Current.AliasBank_EditorMode); - ImguiUtils.ShowHelpMarker("If enabled, editing the name and tags for alias banks will commit the changes to the DSMS base version instead of the mod-specific version."); + Editor.EditorDecorations.ShowHelpMarker("If enabled, editing the name and tags for alias banks will commit the changes to the DSMS base version instead of the mod-specific version."); } if (ImGui.CollapsingHeader("Project", ImGuiTreeNodeFlags.DefaultOpen)) @@ -272,19 +272,19 @@ private unsafe void DisplaySettings_MapEditor() if (ImGui.CollapsingHeader("Map Object List")) { ImGui.Checkbox("Display map names", ref CFG.Current.MapEditor_MapObjectList_ShowMapNames); - ImguiUtils.ShowHoverTooltip("Map names will be displayed within the scene view list."); + Editor.EditorDecorations.ShowHoverTooltip("Map names will be displayed within the scene view list."); ImGui.Checkbox("Display character names", ref CFG.Current.MapEditor_MapObjectList_ShowCharacterNames); - ImguiUtils.ShowHoverTooltip("Characters names will be displayed within the scene view list."); + Editor.EditorDecorations.ShowHoverTooltip("Characters names will be displayed within the scene view list."); ImGui.Checkbox("Display asset names", ref CFG.Current.MapEditor_MapObjectList_ShowAssetNames); - ImguiUtils.ShowHoverTooltip("Asset/object names will be displayed within the scene view list."); + Editor.EditorDecorations.ShowHoverTooltip("Asset/object names will be displayed within the scene view list."); ImGui.Checkbox("Display map piece names", ref CFG.Current.MapEditor_MapObjectList_ShowMapPieceNames); - ImguiUtils.ShowHoverTooltip("Map piece names will be displayed within the scene view list."); + Editor.EditorDecorations.ShowHoverTooltip("Map piece names will be displayed within the scene view list."); ImGui.Checkbox("Display treasure names", ref CFG.Current.MapEditor_MapObjectList_ShowTreasureNames); - ImguiUtils.ShowHoverTooltip("Treasure itemlot names will be displayed within the scene view list."); + Editor.EditorDecorations.ShowHoverTooltip("Treasure itemlot names will be displayed within the scene view list."); } if (ImGui.CollapsingHeader("Selection")) @@ -294,7 +294,7 @@ private unsafe void DisplaySettings_MapEditor() var camera_radius_offset = CFG.Current.Map_MoveSelectionToCamera_Radius; ImGui.Checkbox("Enable selection outline", ref CFG.Current.Viewport_Enable_Selection_Outline); - ImguiUtils.ShowHoverTooltip("Enable the selection outline around map entities."); + Editor.EditorDecorations.ShowHoverTooltip("Enable the selection outline around map entities."); if (CFG.Current.ShowUITooltips) { @@ -905,13 +905,13 @@ private void DisplaySettings_AssetBrowser() if (ImGui.CollapsingHeader("General", ImGuiTreeNodeFlags.DefaultOpen)) { ImGui.Checkbox("Display aliases in browser list", ref CFG.Current.AssetBrowser_ShowAliasesInBrowser); - ImguiUtils.ShowHoverTooltip("Show the aliases for each entry within the browser list as part of their displayed name."); + Editor.EditorDecorations.ShowHoverTooltip("Show the aliases for each entry within the browser list as part of their displayed name."); ImGui.Checkbox("Display tags in browser list", ref CFG.Current.AssetBrowser_ShowTagsInBrowser); - ImguiUtils.ShowHoverTooltip("Show the tags for each entry within the browser list as part of their displayed name."); + Editor.EditorDecorations.ShowHoverTooltip("Show the tags for each entry within the browser list as part of their displayed name."); ImGui.Checkbox("Display low-detail parts in browser list", ref CFG.Current.AssetBrowser_ShowLowDetailParts); - ImguiUtils.ShowHoverTooltip("Show the _l (low-detail) part entries in the Model Editor instance of the Asset Browser."); + Editor.EditorDecorations.ShowHoverTooltip("Show the _l (low-detail) part entries in the Model Editor instance of the Asset Browser."); } ImGui.EndTabItem();