From f24ec8ebe22525179af789f91ff1750b36bfbfc0 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sat, 30 Apr 2022 18:54:17 +0200 Subject: [PATCH] Change ImGui.Text to ImGui.TextUnformatted. --- OtterGui | 2 +- Penumbra/Import/TexToolsImporter.Gui.cs | 14 ++-- .../Loader/ResourceLoader.Replacement.cs | 5 +- Penumbra/Penumbra.cs | 2 +- Penumbra/UI/Classes/ModFileSystemSelector.cs | 19 ++++- Penumbra/UI/Classes/SubModEditWindow.cs | 16 ++-- ...ConfigWindow.CollectionsTab.Inheritance.cs | 2 +- Penumbra/UI/ConfigWindow.CollectionsTab.cs | 2 +- Penumbra/UI/ConfigWindow.DebugTab.cs | 74 +++++++++---------- Penumbra/UI/ConfigWindow.Misc.cs | 2 +- Penumbra/UI/ConfigWindow.ModPanel.Edit.cs | 2 +- Penumbra/UI/ConfigWindow.ModPanel.Header.cs | 4 +- Penumbra/UI/ConfigWindow.ModPanel.Settings.cs | 2 +- Penumbra/UI/ConfigWindow.ModPanel.Tabs.cs | 2 +- 14 files changed, 79 insertions(+), 69 deletions(-) diff --git a/OtterGui b/OtterGui index a1ff5ca2..cce4e9ed 160000 --- a/OtterGui +++ b/OtterGui @@ -1 +1 @@ -Subproject commit a1ff5ca207080786225f716a0e2487e206923a52 +Subproject commit cce4e9ed2cf5fa0068d6c8fadff5acd0d54f8359 diff --git a/Penumbra/Import/TexToolsImporter.Gui.cs b/Penumbra/Import/TexToolsImporter.Gui.cs index b1db1b96..1378d2f7 100644 --- a/Penumbra/Import/TexToolsImporter.Gui.cs +++ b/Penumbra/Import/TexToolsImporter.Gui.cs @@ -38,7 +38,7 @@ public partial class TexToolsImporter var percentage = _modPackCount / ( float )_currentModPackIdx; ImGui.ProgressBar( percentage, size, $"Mod {_currentModPackIdx + 1} / {_modPackCount}" ); ImGui.NewLine(); - ImGui.Text( $"Extracting {_currentModName}..." ); + ImGui.TextUnformatted( $"Extracting {_currentModName}..." ); if( _currentNumOptions > 1 ) { @@ -47,7 +47,7 @@ public partial class TexToolsImporter percentage = _currentNumOptions == 0 ? 1f : _currentOptionIdx / ( float )_currentNumOptions; ImGui.ProgressBar( percentage, size, $"Option {_currentOptionIdx + 1} / {_currentNumOptions}" ); ImGui.NewLine(); - ImGui.Text( + ImGui.TextUnformatted( $"Extracting option {( _currentGroupName.Length == 0 ? string.Empty : $"{_currentGroupName} - " )}{_currentOptionName}..." ); } @@ -56,7 +56,7 @@ public partial class TexToolsImporter percentage = _currentNumFiles == 0 ? 1f : _currentFileIdx / ( float )_currentNumFiles; ImGui.ProgressBar( percentage, size, $"File {_currentFileIdx + 1} / {_currentNumFiles}" ); ImGui.NewLine(); - ImGui.Text( $"Extracting file {_currentFileName}..." ); + ImGui.TextUnformatted( $"Extracting file {_currentFileName}..." ); } } @@ -65,7 +65,7 @@ public partial class TexToolsImporter { var success = ExtractedMods.Count( t => t.Mod != null ); - ImGui.Text( $"Successfully extracted {success} / {ExtractedMods.Count} files." ); + ImGui.TextUnformatted( $"Successfully extracted {success} / {ExtractedMods.Count} files." ); ImGui.NewLine(); using var table = ImRaii.Table( "##files", 2 ); if( !table ) @@ -76,17 +76,17 @@ public partial class TexToolsImporter foreach( var (file, dir, ex) in ExtractedMods ) { ImGui.TableNextColumn(); - ImGui.Text( file.Name ); + ImGui.TextUnformatted( file.Name ); ImGui.TableNextColumn(); if( dir != null ) { using var color = ImRaii.PushColor( ImGuiCol.Text, ColorId.FolderExpanded.Value() ); - ImGui.Text( dir.FullName[ ( _baseDirectory.FullName.Length + 1 ).. ] ); + ImGui.TextUnformatted( dir.FullName[ ( _baseDirectory.FullName.Length + 1 ).. ] ); } else { using var color = ImRaii.PushColor( ImGuiCol.Text, ColorId.ConflictingMod.Value() ); - ImGui.Text( ex!.Message ); + ImGui.TextUnformatted( ex!.Message ); ImGuiUtil.HoverTooltip( ex.ToString() ); } } diff --git a/Penumbra/Interop/Loader/ResourceLoader.Replacement.cs b/Penumbra/Interop/Loader/ResourceLoader.Replacement.cs index fd0a73cb..09572313 100644 --- a/Penumbra/Interop/Loader/ResourceLoader.Replacement.cs +++ b/Penumbra/Interop/Loader/ResourceLoader.Replacement.cs @@ -49,15 +49,14 @@ public unsafe partial class ResourceLoader { if( local != game ) { - PluginLog.Warning( "Hash function appears to have changed. {Hash1:X8} vs {Hash2:X8} for {Path}.", game, local, path ); + PluginLog.Warning( "Hash function appears to have changed. Computed {Hash1:X8} vs Game {Hash2:X8} for {Path}.", local, game, path ); } } private event Action< Utf8GamePath, FullPath?, object? >? PathResolved; private ResourceHandle* GetResourceHandler( bool isSync, ResourceManager* resourceManager, ResourceCategory* categoryId, - ResourceType* resourceType, - int* resourceHash, byte* path, void* unk, bool isUnk ) + ResourceType* resourceType, int* resourceHash, byte* path, void* unk, bool isUnk ) { if( !Utf8GamePath.FromPointer( path, out var gamePath ) ) { diff --git a/Penumbra/Penumbra.cs b/Penumbra/Penumbra.cs index 0e7f80d6..94b22f86 100644 --- a/Penumbra/Penumbra.cs +++ b/Penumbra/Penumbra.cs @@ -187,7 +187,7 @@ public class Penumbra : IDalamudPlugin { if( it is Item ) { - ImGui.Text( "Left Click to create an item link in chat." ); + ImGui.TextUnformatted( "Left Click to create an item link in chat." ); } }; Api.ChangedItemClicked += ( button, it ) => diff --git a/Penumbra/UI/Classes/ModFileSystemSelector.cs b/Penumbra/UI/Classes/ModFileSystemSelector.cs index 1a85e371..4c061110 100644 --- a/Penumbra/UI/Classes/ModFileSystemSelector.cs +++ b/Penumbra/UI/Classes/ModFileSystemSelector.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Numerics; +using System.Runtime.CompilerServices; using System.Threading.Tasks; using Dalamud.Interface; using Dalamud.Interface.ImGuiFileDialog; @@ -178,16 +179,26 @@ public sealed partial class ModFileSystemSelector : FileSystemSelector< Mod, Mod private void DrawInfoPopup() { var display = ImGui.GetIO().DisplaySize; - ImGui.SetNextWindowSize( display / 4 ); - ImGui.SetNextWindowPos( 3 * display / 8 ); + var height = Math.Max( display.Y / 4, 15 * ImGui.GetFrameHeightWithSpacing() ); + var width = display.X / 8; + var size = new Vector2( width * 2, height ); + var pos = ( display - size ) / 2; + ImGui.SetNextWindowSize( size ); + ImGui.SetNextWindowPos( pos ); using var popup = ImRaii.Popup( "Import Status", ImGuiWindowFlags.Modal ); if( _import == null || !popup.Success ) { return; } - _import.DrawProgressInfo( new Vector2( -1, ImGui.GetFrameHeight() ) ); - ImGui.SetCursorPosY( ImGui.GetWindowHeight() - ImGui.GetFrameHeight() * 2 ); + using( var child = ImRaii.Child( "##import", new Vector2( -1, size.Y - ImGui.GetFrameHeight() * 2 ) ) ) + { + if( child ) + { + _import.DrawProgressInfo( new Vector2( -1, ImGui.GetFrameHeight() ) ); + } + } + if( _import.State == ImporterState.Done && ImGui.Button( "Close", -Vector2.UnitX ) || _import.State != ImporterState.Done && _import.DrawCancelButton( -Vector2.UnitX ) ) { diff --git a/Penumbra/UI/Classes/SubModEditWindow.cs b/Penumbra/UI/Classes/SubModEditWindow.cs index 8b562959..b56897f5 100644 --- a/Penumbra/UI/Classes/SubModEditWindow.cs +++ b/Penumbra/UI/Classes/SubModEditWindow.cs @@ -119,11 +119,11 @@ public class SubModEditWindow : Window ImGui.TableNextColumn(); ConfigWindow.Text( file.RelFile.Path ); ImGui.TableNextColumn(); - ImGui.Text( file.Size.ToString() ); + ImGui.TextUnformatted( file.Size.ToString() ); ImGui.TableNextColumn(); if( file.SubMods.Count == 0 ) { - ImGui.Text( "Unused" ); + ImGui.TextUnformatted( "Unused" ); } foreach( var (groupIdx, optionIdx, gamePath) in file.SubMods ) @@ -135,7 +135,7 @@ public class SubModEditWindow : Window var text = groupIdx >= 0 ? $"{group!.Name} - {option.Name}" : option.Name; - ImGui.Text( text ); + ImGui.TextUnformatted( text ); ImGui.TableNextColumn(); ConfigWindow.Text( gamePath.Path ); } @@ -147,7 +147,7 @@ public class SubModEditWindow : Window ImGui.TableNextColumn(); ConfigWindow.Text( gamePath.Path ); ImGui.TableNextColumn(); - ImGui.Text( fullPath.FullName ); + ImGui.TextUnformatted( fullPath.FullName ); ImGui.TableNextColumn(); } } @@ -169,9 +169,9 @@ public class SubModEditWindow : Window foreach( var manip in _manipulations ) { ImGui.TableNextColumn(); - ImGui.Text( manip.ManipulationType.ToString() ); + ImGui.TextUnformatted( manip.ManipulationType.ToString() ); ImGui.TableNextColumn(); - ImGui.Text( manip.ManipulationType switch + ImGui.TextUnformatted( manip.ManipulationType switch { MetaManipulation.Type.Imc => manip.Imc.ToString(), MetaManipulation.Type.Eqdp => manip.Eqdp.ToString(), @@ -182,7 +182,7 @@ public class SubModEditWindow : Window _ => string.Empty, } ); ImGui.TableNextColumn(); - ImGui.Text( manip.ManipulationType switch + ImGui.TextUnformatted( manip.ManipulationType switch { MetaManipulation.Type.Imc => manip.Imc.Entry.ToString(), MetaManipulation.Type.Eqdp => manip.Eqdp.Entry.ToString(), @@ -214,7 +214,7 @@ public class SubModEditWindow : Window ImGui.TableNextColumn(); ConfigWindow.Text( from.Path ); ImGui.TableNextColumn(); - ImGui.Text( to.FullName ); + ImGui.TextUnformatted( to.FullName ); ImGui.TableNextColumn(); } } diff --git a/Penumbra/UI/ConfigWindow.CollectionsTab.Inheritance.cs b/Penumbra/UI/ConfigWindow.CollectionsTab.Inheritance.cs index 6d4ed0ec..949b03b0 100644 --- a/Penumbra/UI/ConfigWindow.CollectionsTab.Inheritance.cs +++ b/Penumbra/UI/ConfigWindow.CollectionsTab.Inheritance.cs @@ -260,7 +260,7 @@ public partial class ConfigWindow { ImGui.SetDragDropPayload( InheritanceDragDropLabel, IntPtr.Zero, 0 ); _movedInheritance = collection; - ImGui.Text( $"Moving {_movedInheritance?.Name ?? "Unknown"}..." ); + ImGui.TextUnformatted( $"Moving {_movedInheritance?.Name ?? "Unknown"}..." ); } } diff --git a/Penumbra/UI/ConfigWindow.CollectionsTab.cs b/Penumbra/UI/ConfigWindow.CollectionsTab.cs index 76024c0e..8b2ff916 100644 --- a/Penumbra/UI/ConfigWindow.CollectionsTab.cs +++ b/Penumbra/UI/ConfigWindow.CollectionsTab.cs @@ -162,7 +162,7 @@ public partial class ConfigWindow ImGui.SameLine(); ImGui.AlignTextToFramePadding(); - ImGui.Text( name ); + ImGui.TextUnformatted( name ); } DrawNewCharacterCollection(); diff --git a/Penumbra/UI/ConfigWindow.DebugTab.cs b/Penumbra/UI/ConfigWindow.DebugTab.cs index 85b713c7..2b153bd3 100644 --- a/Penumbra/UI/ConfigWindow.DebugTab.cs +++ b/Penumbra/UI/ConfigWindow.DebugTab.cs @@ -131,17 +131,17 @@ public partial class ConfigWindow var refCountManip = data.ManipulatedResource == null ? 0 : data.ManipulatedResource->RefCount; var refCountOrig = data.OriginalResource == null ? 0 : data.OriginalResource->RefCount; ImGui.TableNextColumn(); - ImGui.Text( data.ManipulatedPath.ToString() ); + ImGui.TextUnformatted( data.ManipulatedPath.ToString() ); ImGui.TableNextColumn(); - ImGui.Text( ( ( ulong )data.ManipulatedResource ).ToString( "X" ) ); + ImGui.TextUnformatted( ( ( ulong )data.ManipulatedResource ).ToString( "X" ) ); ImGui.TableNextColumn(); - ImGui.Text( refCountManip.ToString() ); + ImGui.TextUnformatted( refCountManip.ToString() ); ImGui.TableNextColumn(); - ImGui.Text( data.OriginalPath.ToString() ); + ImGui.TextUnformatted( data.OriginalPath.ToString() ); ImGui.TableNextColumn(); - ImGui.Text( ( ( ulong )data.OriginalResource ).ToString( "X" ) ); + ImGui.TextUnformatted( ( ( ulong )data.OriginalResource ).ToString( "X" ) ); ImGui.TableNextColumn(); - ImGui.Text( refCountOrig.ToString() ); + ImGui.TextUnformatted( refCountOrig.ToString() ); } } @@ -163,15 +163,15 @@ public partial class ConfigWindow foreach( var (ptr, (c, idx)) in _window._penumbra.PathResolver.DrawObjectToObject ) { ImGui.TableNextColumn(); - ImGui.Text( ptr.ToString( "X" ) ); + ImGui.TextUnformatted( ptr.ToString( "X" ) ); ImGui.TableNextColumn(); - ImGui.Text( idx.ToString() ); + ImGui.TextUnformatted( idx.ToString() ); ImGui.TableNextColumn(); - ImGui.Text( Dalamud.Objects[ idx ]?.Address.ToString() ?? "NULL" ); + ImGui.TextUnformatted( Dalamud.Objects[ idx ]?.Address.ToString() ?? "NULL" ); ImGui.TableNextColumn(); - ImGui.Text( Dalamud.Objects[ idx ]?.Name.ToString() ?? "NULL" ); + ImGui.TextUnformatted( Dalamud.Objects[ idx ]?.Name.ToString() ?? "NULL" ); ImGui.TableNextColumn(); - ImGui.Text( c.Name ); + ImGui.TextUnformatted( c.Name ); } } } @@ -189,7 +189,7 @@ public partial class ConfigWindow ImGui.TableNextColumn(); ImGuiNative.igTextUnformatted( path.Path, path.Path + path.Length ); ImGui.TableNextColumn(); - ImGui.Text( collection.Name ); + ImGui.TextUnformatted( collection.Name ); } } } @@ -216,7 +216,7 @@ public partial class ConfigWindow var idx = CharacterUtility.RelevantIndices[ i ]; var resource = ( ResourceHandle* )Penumbra.CharacterUtility.Address->Resources[ idx ]; ImGui.TableNextColumn(); - ImGui.Text( $"0x{( ulong )resource:X}" ); + ImGui.TextUnformatted( $"0x{( ulong )resource:X}" ); ImGui.TableNextColumn(); Text( resource ); ImGui.TableNextColumn(); @@ -234,7 +234,7 @@ public partial class ConfigWindow ImGuiUtil.HoverTooltip( "Click to copy bytes to clipboard." ); ImGui.TableNextColumn(); - ImGui.Text( $"{resource->GetData().Length}" ); + ImGui.TextUnformatted( $"{resource->GetData().Length}" ); ImGui.TableNextColumn(); ImGui.Selectable( $"0x{Penumbra.CharacterUtility.DefaultResources[ i ].Address:X}" ); if( ImGui.IsItemClicked() ) @@ -247,7 +247,7 @@ public partial class ConfigWindow ImGuiUtil.HoverTooltip( "Click to copy bytes to clipboard." ); ImGui.TableNextColumn(); - ImGui.Text( $"{Penumbra.CharacterUtility.DefaultResources[ i ].Size}" ); + ImGui.TextUnformatted( $"{Penumbra.CharacterUtility.DefaultResources[ i ].Size}" ); } } @@ -275,7 +275,7 @@ public partial class ConfigWindow { var resource = Penumbra.ResidentResources.Address->ResourceList[ i ]; ImGui.TableNextColumn(); - ImGui.Text( $"0x{( ulong )resource:X}" ); + ImGui.TextUnformatted( $"0x{( ulong )resource:X}" ); ImGui.TableNextColumn(); Text( resource ); } @@ -319,9 +319,9 @@ public partial class ConfigWindow var imc = ( ResourceHandle* )model->IMCArray[ i ]; ImGui.TableNextRow(); ImGui.TableNextColumn(); - ImGui.Text( $"Slot {i}" ); + ImGui.TextUnformatted( $"Slot {i}" ); ImGui.TableNextColumn(); - ImGui.Text( imc == null ? "NULL" : $"0x{( ulong )imc:X}" ); + ImGui.TextUnformatted( imc == null ? "NULL" : $"0x{( ulong )imc:X}" ); ImGui.TableNextColumn(); if( imc != null ) { @@ -330,7 +330,7 @@ public partial class ConfigWindow var mdl = ( RenderModel* )model->ModelArray[ i ]; ImGui.TableNextColumn(); - ImGui.Text( mdl == null ? "NULL" : $"0x{( ulong )mdl:X}" ); + ImGui.TextUnformatted( mdl == null ? "NULL" : $"0x{( ulong )mdl:X}" ); if( mdl == null || mdl->ResourceHandle == null || mdl->ResourceHandle->Category != ResourceCategory.Chara ) { continue; @@ -367,15 +367,15 @@ public partial class ConfigWindow } ImGui.TableNextColumn(); - ImGui.Text( r->Category.ToString() ); + ImGui.TextUnformatted( r->Category.ToString() ); ImGui.TableNextColumn(); - ImGui.Text( r->FileType.ToString( "X" ) ); + ImGui.TextUnformatted( r->FileType.ToString( "X" ) ); ImGui.TableNextColumn(); - ImGui.Text( r->Id.ToString( "X" ) ); + ImGui.TextUnformatted( r->Id.ToString( "X" ) ); ImGui.TableNextColumn(); - ImGui.Text( ( ( ulong )r ).ToString( "X" ) ); + ImGui.TextUnformatted( ( ( ulong )r ).ToString( "X" ) ); ImGui.TableNextColumn(); - ImGui.Text( r->RefCount.ToString() ); + ImGui.TextUnformatted( r->RefCount.ToString() ); ImGui.TableNextColumn(); ref var name = ref r->FileName; if( name.Capacity > 15 ) @@ -402,52 +402,52 @@ public partial class ConfigWindow } var ipc = _window._penumbra.Ipc; - ImGui.Text( $"API Version: {ipc.Api.ApiVersion}" ); - ImGui.Text( "Available subscriptions:" ); + ImGui.TextUnformatted( $"API Version: {ipc.Api.ApiVersion}" ); + ImGui.TextUnformatted( "Available subscriptions:" ); using var indent = ImRaii.PushIndent(); if( ipc.ProviderApiVersion != null ) { - ImGui.Text( PenumbraIpc.LabelProviderApiVersion ); + ImGui.TextUnformatted( PenumbraIpc.LabelProviderApiVersion ); } if( ipc.ProviderRedrawName != null ) { - ImGui.Text( PenumbraIpc.LabelProviderRedrawName ); + ImGui.TextUnformatted( PenumbraIpc.LabelProviderRedrawName ); } if( ipc.ProviderRedrawObject != null ) { - ImGui.Text( PenumbraIpc.LabelProviderRedrawObject ); + ImGui.TextUnformatted( PenumbraIpc.LabelProviderRedrawObject ); } if( ipc.ProviderRedrawAll != null ) { - ImGui.Text( PenumbraIpc.LabelProviderRedrawAll ); + ImGui.TextUnformatted( PenumbraIpc.LabelProviderRedrawAll ); } if( ipc.ProviderResolveDefault != null ) { - ImGui.Text( PenumbraIpc.LabelProviderResolveDefault ); + ImGui.TextUnformatted( PenumbraIpc.LabelProviderResolveDefault ); } if( ipc.ProviderResolveCharacter != null ) { - ImGui.Text( PenumbraIpc.LabelProviderResolveCharacter ); + ImGui.TextUnformatted( PenumbraIpc.LabelProviderResolveCharacter ); } if( ipc.ProviderChangedItemTooltip != null ) { - ImGui.Text( PenumbraIpc.LabelProviderChangedItemTooltip ); + ImGui.TextUnformatted( PenumbraIpc.LabelProviderChangedItemTooltip ); } if( ipc.ProviderChangedItemClick != null ) { - ImGui.Text( PenumbraIpc.LabelProviderChangedItemClick ); + ImGui.TextUnformatted( PenumbraIpc.LabelProviderChangedItemClick ); } if( ipc.ProviderGetChangedItems != null ) { - ImGui.Text( PenumbraIpc.LabelProviderGetChangedItems ); + ImGui.TextUnformatted( PenumbraIpc.LabelProviderGetChangedItems ); } } @@ -455,9 +455,9 @@ public partial class ConfigWindow private static void PrintValue( string name, string value ) { ImGui.TableNextColumn(); - ImGui.Text( name ); + ImGui.TextUnformatted( name ); ImGui.TableNextColumn(); - ImGui.Text( value ); + ImGui.TextUnformatted( value ); } } } \ No newline at end of file diff --git a/Penumbra/UI/ConfigWindow.Misc.cs b/Penumbra/UI/ConfigWindow.Misc.cs index 850d4e85..cae9a870 100644 --- a/Penumbra/UI/ConfigWindow.Misc.cs +++ b/Penumbra/UI/ConfigWindow.Misc.cs @@ -51,7 +51,7 @@ public partial class ConfigWindow group.Dispose(); if( ImGui.GetItemRectSize() == Vector2.Zero ) { - ImGui.Text( "No actions available." ); + ImGui.TextUnformatted( "No actions available." ); } } diff --git a/Penumbra/UI/ConfigWindow.ModPanel.Edit.cs b/Penumbra/UI/ConfigWindow.ModPanel.Edit.cs index 2d751625..f2c9ad8d 100644 --- a/Penumbra/UI/ConfigWindow.ModPanel.Edit.cs +++ b/Penumbra/UI/ConfigWindow.ModPanel.Edit.cs @@ -322,7 +322,7 @@ public partial class ConfigWindow _dragDropOptionIdx = optionIdx; } - ImGui.Text( $"Dragging option {group[ optionIdx ].Name} from group {group.Name}..." ); + ImGui.TextUnformatted( $"Dragging option {group[ optionIdx ].Name} from group {group.Name}..." ); } } diff --git a/Penumbra/UI/ConfigWindow.ModPanel.Header.cs b/Penumbra/UI/ConfigWindow.ModPanel.Header.cs index 6b91c1b0..6830884e 100644 --- a/Penumbra/UI/ConfigWindow.ModPanel.Header.cs +++ b/Penumbra/UI/ConfigWindow.ModPanel.Header.cs @@ -130,7 +130,7 @@ public partial class ConfigWindow ImGuiUtil.TextColored( Colors.MetaInfoText, "by " ); ImGui.SameLine(); style.Pop(); - ImGui.Text( _mod.Author ); + ImGui.TextUnformatted( _mod.Author ); } // Draw either a website button if the source is a valid website address, @@ -163,7 +163,7 @@ public partial class ConfigWindow ImGuiUtil.TextColored( Colors.MetaInfoText, "from " ); ImGui.SameLine(); style.Pop(); - ImGui.Text( _mod.Website ); + ImGui.TextUnformatted( _mod.Website ); } } diff --git a/Penumbra/UI/ConfigWindow.ModPanel.Settings.cs b/Penumbra/UI/ConfigWindow.ModPanel.Settings.cs index f4168fb3..197a846d 100644 --- a/Penumbra/UI/ConfigWindow.ModPanel.Settings.cs +++ b/Penumbra/UI/ConfigWindow.ModPanel.Settings.cs @@ -174,7 +174,7 @@ public partial class ConfigWindow } else { - ImGui.Text( group.Name ); + ImGui.TextUnformatted( group.Name ); } } diff --git a/Penumbra/UI/ConfigWindow.ModPanel.Tabs.cs b/Penumbra/UI/ConfigWindow.ModPanel.Tabs.cs index f8982852..a1081ac5 100644 --- a/Penumbra/UI/ConfigWindow.ModPanel.Tabs.cs +++ b/Penumbra/UI/ConfigWindow.ModPanel.Tabs.cs @@ -132,7 +132,7 @@ public partial class ConfigWindow ImGui.SameLine(); using var color = ImRaii.PushColor( ImGuiCol.Text, conflict.Mod1Priority ? ColorId.HandledConflictMod.Value() : ColorId.ConflictingMod.Value() ); - ImGui.Text( $"(Priority {Penumbra.CollectionManager.Current[ conflict.Mod2 ].Settings!.Priority})" ); + ImGui.TextUnformatted( $"(Priority {Penumbra.CollectionManager.Current[ conflict.Mod2 ].Settings!.Priority})" ); indent.Push( 30f ); }