From 2b0d55bc69d9d009649ecaa4d84ff83fb8749354 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Tue, 19 Oct 2021 18:53:20 +0200 Subject: [PATCH] Fix scrolling in Changed Items tab. --- Penumbra/UI/MenuTabs/TabChangedItems.cs | 4 ++-- Penumbra/UI/UiHelpers.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Penumbra/UI/MenuTabs/TabChangedItems.cs b/Penumbra/UI/MenuTabs/TabChangedItems.cs index c161b6d9..a22a5ff5 100644 --- a/Penumbra/UI/MenuTabs/TabChangedItems.cs +++ b/Penumbra/UI/MenuTabs/TabChangedItems.cs @@ -42,7 +42,7 @@ namespace Penumbra.UI _filterLower = _filter.ToLowerInvariant(); } - if( !ImGui.BeginTable( "##ChangedItemsTable", 1, ImGuiTableFlags.RowBg, AutoFillSize ) ) + if( !ImGui.BeginTable( "##ChangedItemsTable", 1, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY, AutoFillSize ) ) { return; } @@ -64,7 +64,7 @@ namespace Penumbra.UI { ImGui.TableNextRow(); ImGui.TableNextColumn(); - _base.DrawChangedItem( name, data ); + _base.DrawChangedItem( name, data, ImGui.GetStyle().ScrollbarSize ); } } } diff --git a/Penumbra/UI/UiHelpers.cs b/Penumbra/UI/UiHelpers.cs index 47c0e59b..a69a8296 100644 --- a/Penumbra/UI/UiHelpers.cs +++ b/Penumbra/UI/UiHelpers.cs @@ -9,7 +9,7 @@ namespace Penumbra.UI { public partial class SettingsInterface { - internal void DrawChangedItem( string name, object? data ) + internal void DrawChangedItem( string name, object? data, float itemIdOffset = 0) { var ret = ImGui.Selectable( name ) ? MouseButton.Left : MouseButton.None; ret = ImGui.IsItemClicked( ImGuiMouseButton.Right ) ? MouseButton.Right : ret; @@ -30,7 +30,8 @@ namespace Penumbra.UI if( data is Item it ) { var modelId = $"({( ( Quad )it.ModelMain ).A})"; - var offset = ImGui.CalcTextSize( modelId ).X - ImGui.GetStyle().ItemInnerSpacing.X; + var offset = ImGui.CalcTextSize( modelId ).X - ImGui.GetStyle().ItemInnerSpacing.X + itemIdOffset; + ImGui.SameLine( ImGui.GetWindowContentRegionWidth() - offset ); ImGui.TextColored( new Vector4( 0.5f, 0.5f, 0.5f, 1 ), modelId ); }