From efdece613a4b3df5e03a2ecb134564495c2892e1 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Sat, 14 Jan 2023 19:57:42 +0100 Subject: [PATCH] Add names, maybe fix combos. --- OtterGui | 2 +- Penumbra/Penumbra.json | 2 +- Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs | 2 +- Penumbra/UI/ConfigWindow.CollectionsTab.cs | 2 +- base_repo.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OtterGui b/OtterGui index 774f1678..d018a822 160000 --- a/OtterGui +++ b/OtterGui @@ -1 +1 @@ -Subproject commit 774f16781b350da5b14612ef4a1409082e6eda5b +Subproject commit d018a822212a68492771db1ee6a8921df36f677d diff --git a/Penumbra/Penumbra.json b/Penumbra/Penumbra.json index 8c1f6680..cf7170d8 100644 --- a/Penumbra/Penumbra.json +++ b/Penumbra/Penumbra.json @@ -1,5 +1,5 @@ { - "Author": "Adam", + "Author": "Ottermandias, Adam, Wintermute", "Name": "Penumbra", "Description": "Runtime mod loader and manager.", "InternalName": "Penumbra", diff --git a/Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs b/Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs index 39ab6a6c..83e7d79e 100644 --- a/Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs +++ b/Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs @@ -130,7 +130,7 @@ public partial class ConfigWindow { var (name, _) = Penumbra.CollectionManager.Individuals[ i ]; using var id = ImRaii.PushId( i ); - CollectionsWithEmpty.Draw( string.Empty, _window._inputTextWidth.X, i ); + CollectionsWithEmpty.Draw( "##IndividualCombo", _window._inputTextWidth.X, i ); ImGui.SameLine(); if( ImGuiUtil.DrawDisabledButton( FontAwesomeIcon.Trash.ToIconString(), _window._iconButtonSize, string.Empty, false, true ) ) diff --git a/Penumbra/UI/ConfigWindow.CollectionsTab.cs b/Penumbra/UI/ConfigWindow.CollectionsTab.cs index d1769cd3..979ada02 100644 --- a/Penumbra/UI/ConfigWindow.CollectionsTab.cs +++ b/Penumbra/UI/ConfigWindow.CollectionsTab.cs @@ -225,7 +225,7 @@ public partial class ConfigWindow if( collection != null ) { using var id = ImRaii.PushId( ( int )type ); - DrawCollectionSelector( string.Empty, _window._inputTextWidth.X, type, true ); + DrawCollectionSelector( "##SpecialCombo", _window._inputTextWidth.X, type, true ); ImGui.SameLine(); if( ImGuiUtil.DrawDisabledButton( FontAwesomeIcon.Trash.ToIconString(), _window._iconButtonSize, string.Empty, false, true ) ) diff --git a/base_repo.json b/base_repo.json index 0b50da65..202d59de 100644 --- a/base_repo.json +++ b/base_repo.json @@ -1,6 +1,6 @@ [ { - "Author": "Adam", + "Author": "Ottermandias, Adam, Wintermute", "Name": "Penumbra", "Description": "Runtime mod loader and manager.", "InternalName": "Penumbra",