ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix scrolling in Changed Items tab.

Browse source
This commit is contained in:
Ottermandias 2021-10-19 18:53:20 +02:00
parent 572f4f5e6b
commit 2b0d55bc69
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra/UI/MenuTabs/TabChangedItems.cs
View file

@ -42,7 +42,7 @@ namespace Penumbra.UI
_filterLower = _filter.ToLowerInvariant(); _filterLower = _filter.ToLowerInvariant();
} }
if( !ImGui.BeginTable( "##ChangedItemsTable", 1, ImGuiTableFlags.RowBg, AutoFillSize ) ) if( !ImGui.BeginTable( "##ChangedItemsTable", 1, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY, AutoFillSize ) )
{ {
return; return;
} }
@ -64,7 +64,7 @@ namespace Penumbra.UI
{ {
ImGui.TableNextRow(); ImGui.TableNextRow();
ImGui.TableNextColumn(); ImGui.TableNextColumn();
_base.DrawChangedItem( name, data ); _base.DrawChangedItem( name, data, ImGui.GetStyle().ScrollbarSize );
} }
} }
} }

5
Penumbra/UI/UiHelpers.cs
View file

@ -9,7 +9,7 @@ namespace Penumbra.UI
{ {
public partial class SettingsInterface 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; var ret = ImGui.Selectable( name ) ? MouseButton.Left : MouseButton.None;
ret = ImGui.IsItemClicked( ImGuiMouseButton.Right ) ? MouseButton.Right : ret; ret = ImGui.IsItemClicked( ImGuiMouseButton.Right ) ? MouseButton.Right : ret;
@ -30,7 +30,8 @@ namespace Penumbra.UI
if( data is Item it ) if( data is Item it )
{ {
var modelId = $"({( ( Quad )it.ModelMain ).A})"; 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.SameLine( ImGui.GetWindowContentRegionWidth() - offset );
ImGui.TextColored( new Vector4( 0.5f, 0.5f, 0.5f, 1 ), modelId ); ImGui.TextColored( new Vector4( 0.5f, 0.5f, 0.5f, 1 ), modelId );
} }