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

Add option to scale the mod selector with window growth.

Browse source
This commit is contained in:
Ottermandias 2021-07-23 12:47:54 +02:00
parent 66427d32f5
commit c7d22935ef
4 changed files with 47 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Penumbra/Configuration.cs
View file

@ -15,6 +15,7 @@ namespace Penumbra
public bool IsEnabled { get; set; } = true; public bool IsEnabled { get; set; } = true;
public bool ScaleModSelector { get; set; } = false;
public bool ShowAdvanced { get; set; } public bool ShowAdvanced { get; set; }
public bool DisableFileSystemNotifications { get; set; } public bool DisableFileSystemNotifications { get; set; }

49
Penumbra/UI/MenuTabs/TabInstalled/TabInstalledSelector.cs
View file

@ -84,6 +84,8 @@ namespace Penumbra.UI
private List< Mod.Mod >? Mods private List< Mod.Mod >? Mods
=> _modManager.Collections.CurrentCollection.Cache?.AvailableMods; => _modManager.Collections.CurrentCollection.Cache?.AvailableMods;
private float _selectorFactor = 1;
public Mod.Mod? Mod { get; private set; } public Mod.Mod? Mod { get; private set; }
private int _index; private int _index;
private int? _deleteIndex; private int? _deleteIndex;
@ -120,7 +122,7 @@ namespace Penumbra.UI
{ {
ImGui.PushFont( UiBuilder.IconFont ); ImGui.PushFont( UiBuilder.IconFont );
if( ImGui.Button( FontAwesomeIcon.Trash.ToIconString(), SelectorButtonSizes ) ) if( ImGui.Button( FontAwesomeIcon.Trash.ToIconString(), SelectorButtonSizes * _selectorFactor ) )
{ {
_deleteIndex = _index; _deleteIndex = _index;
} }
@ -182,7 +184,7 @@ namespace Penumbra.UI
ImGui.PushFont( UiBuilder.IconFont ); ImGui.PushFont( UiBuilder.IconFont );
if( ImGui.Button( FontAwesomeIcon.Plus.ToIconString(), SelectorButtonSizes ) ) if( ImGui.Button( FontAwesomeIcon.Plus.ToIconString(), SelectorButtonSizes * _selectorFactor ) )
{ {
_keyboardFocus = true; _keyboardFocus = true;
ImGui.OpenPopup( LabelAddModPopup ); ImGui.OpenPopup( LabelAddModPopup );
@ -199,7 +201,7 @@ namespace Penumbra.UI
private void DrawModHelpButton() private void DrawModHelpButton()
{ {
ImGui.PushFont( UiBuilder.IconFont ); ImGui.PushFont( UiBuilder.IconFont );
if( ImGui.Button( FontAwesomeIcon.QuestionCircle.ToIconString(), HelpButtonSizes ) ) if( ImGui.Button( FontAwesomeIcon.QuestionCircle.ToIconString(), HelpButtonSizes * _selectorFactor ) )
{ {
ImGui.OpenPopup( LabelModHelpPopup ); ImGui.OpenPopup( LabelModHelpPopup );
} }
@ -210,7 +212,8 @@ namespace Penumbra.UI
private void DrawModHelpPopup() private void DrawModHelpPopup()
{ {
ImGui.SetNextWindowPos( ImGui.GetMainViewport().GetCenter(), ImGuiCond.Appearing, Vector2.One / 2 ); ImGui.SetNextWindowPos( ImGui.GetMainViewport().GetCenter(), ImGuiCond.Appearing, Vector2.One / 2 );
ImGui.SetNextWindowSize( new Vector2( 5 * SelectorPanelWidth, 29 * ImGui.GetTextLineHeightWithSpacing() ), ImGuiCond.Appearing ); ImGui.SetNextWindowSize( new Vector2( 5 * SelectorPanelWidth, 29 * ImGui.GetTextLineHeightWithSpacing() ),
ImGuiCond.Appearing );
var _ = true; var _ = true;
if( !ImGui.BeginPopupModal( LabelModHelpPopup, ref _, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove ) ) if( !ImGui.BeginPopupModal( LabelModHelpPopup, ref _, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove ) )
{ {
@ -220,7 +223,7 @@ namespace Penumbra.UI
ImGui.Dummy( Vector2.UnitY * ImGui.GetTextLineHeight() ); ImGui.Dummy( Vector2.UnitY * ImGui.GetTextLineHeight() );
ImGui.Text( "Mod Selector" ); ImGui.Text( "Mod Selector" );
ImGui.BulletText( "Select a mod to obtain more information." ); ImGui.BulletText( "Select a mod to obtain more information." );
ImGui.BulletText( "Mod names are colored according to their current state in the collection:" ); ImGui.BulletText( "Mod names are colored according to their current state in the collection:" );
ImGui.Indent(); ImGui.Indent();
ImGui.Bullet(); ImGui.Bullet();
ImGui.SameLine(); ImGui.SameLine();
@ -230,16 +233,20 @@ namespace Penumbra.UI
ImGui.TextColored( ImGui.ColorConvertU32ToFloat4( DisabledModColor ), "Disabled in the current collection." ); ImGui.TextColored( ImGui.ColorConvertU32ToFloat4( DisabledModColor ), "Disabled in the current collection." );
ImGui.Bullet(); ImGui.Bullet();
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextColored( ImGui.ColorConvertU32ToFloat4( HandledConflictModColor ), "Enabled and conflicting with another enabled Mod, but on different priorities (i.e. the conflict is solved)." ); ImGui.TextColored( ImGui.ColorConvertU32ToFloat4( HandledConflictModColor ),
"Enabled and conflicting with another enabled Mod, but on different priorities (i.e. the conflict is solved)." );
ImGui.Bullet(); ImGui.Bullet();
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextColored( ImGui.ColorConvertU32ToFloat4( ConflictingModColor ), "Enabled and conflicting with another enabled Mod on the same priority." ); ImGui.TextColored( ImGui.ColorConvertU32ToFloat4( ConflictingModColor ),
"Enabled and conflicting with another enabled Mod on the same priority." );
ImGui.Unindent(); ImGui.Unindent();
ImGui.BulletText( "Right-click a mod to enter its sort order, which is its name by default." ); ImGui.BulletText( "Right-click a mod to enter its sort order, which is its name by default." );
ImGui.Indent(); ImGui.Indent();
ImGui.BulletText( "A sort order differing from the mods name will not be displayed, it will just be used for ordering." ); ImGui.BulletText( "A sort order differing from the mods name will not be displayed, it will just be used for ordering." );
ImGui.BulletText( "If the sort order string contains Forward-Slashes ('/'), the preceding substring will be turned into collapsible folders that can group mods." ); ImGui.BulletText(
ImGui.BulletText( "Collapsible folders can contain further collapsible folders, so \"folder1/folder2/folder3/1\" will produce 3 folders\n\t\t[folder1] -> [folder2] -> [folder3] -> [ModName],\nwhere ModName will be sorted as if it was the string '1'." ); "If the sort order string contains Forward-Slashes ('/'), the preceding substring will be turned into collapsible folders that can group mods." );
ImGui.BulletText(
"Collapsible folders can contain further collapsible folders, so \"folder1/folder2/folder3/1\" will produce 3 folders\n\t\t[folder1] -> [folder2] -> [folder3] -> [ModName],\nwhere ModName will be sorted as if it was the string '1'." );
ImGui.Unindent(); ImGui.Unindent();
ImGui.BulletText( "Use the Filter Mods... input at the top to filter the list for mods with names containing the text." ); ImGui.BulletText( "Use the Filter Mods... input at the top to filter the list for mods with names containing the text." );
ImGui.Indent(); ImGui.Indent();
@ -248,14 +255,16 @@ namespace Penumbra.UI
ImGui.Unindent(); ImGui.Unindent();
ImGui.BulletText( "Use the expandable menu beside the input to filter for mods fulfilling specific criteria." ); ImGui.BulletText( "Use the expandable menu beside the input to filter for mods fulfilling specific criteria." );
ImGui.Dummy( Vector2.UnitY * ImGui.GetTextLineHeight() ); ImGui.Dummy( Vector2.UnitY * ImGui.GetTextLineHeight() );
ImGui.Text( "Mod Management" ); ImGui.Text( "Mod Management" );
ImGui.BulletText( "You can delete the currently selected mod with the trashcan button." ); ImGui.BulletText( "You can delete the currently selected mod with the trashcan button." );
ImGui.BulletText( "You can add a completely empty mod with the plus button." ); ImGui.BulletText( "You can add a completely empty mod with the plus button." );
ImGui.BulletText( "You can import TTMP-based mods in the import tab." ); ImGui.BulletText( "You can import TTMP-based mods in the import tab." );
ImGui.BulletText( "You can import penumbra-based mods by moving the corresponding folder into your mod directory in a file explorer, then rediscovering mods." ); ImGui.BulletText(
ImGui.BulletText( "If you enable Advanced Options in the Settings tab, you can toggle Edit Mode to manipulate your selected mod even further." ); "You can import penumbra-based mods by moving the corresponding folder into your mod directory in a file explorer, then rediscovering mods." );
ImGui.Dummy( Vector2.UnitY * ImGui.GetTextLineHeight() ); ImGui.BulletText(
ImGui.Dummy( Vector2.UnitX * 2 * SelectorPanelWidth ); "If you enable Advanced Options in the Settings tab, you can toggle Edit Mode to manipulate your selected mod even further." );
ImGui.Dummy( Vector2.UnitY * ImGui.GetTextLineHeight() );
ImGui.Dummy( Vector2.UnitX * 2 * SelectorPanelWidth );
ImGui.SameLine(); ImGui.SameLine();
if( ImGui.Button( "Understood", Vector2.UnitX * SelectorPanelWidth ) ) if( ImGui.Button( "Understood", Vector2.UnitX * SelectorPanelWidth ) )
{ {
@ -267,7 +276,7 @@ namespace Penumbra.UI
private void DrawModsSelectorFilter() private void DrawModsSelectorFilter()
{ {
ImGui.SetNextItemWidth( SelectorPanelWidth - 22 ); ImGui.SetNextItemWidth( SelectorPanelWidth * _selectorFactor - 22 );
if( ImGui.InputTextWithHint( LabelModFilter, "Filter Mods...", ref _modFilterInput, 256 ) ) if( ImGui.InputTextWithHint( LabelModFilter, "Filter Mods...", ref _modFilterInput, 256 ) )
{ {
var lower = _modFilterInput.ToLowerInvariant(); var lower = _modFilterInput.ToLowerInvariant();
@ -328,7 +337,7 @@ namespace Penumbra.UI
DrawModHelpButton(); DrawModHelpButton();
ImGui.SameLine(); ImGui.SameLine();
DrawModAddButton(); DrawModAddButton();
ImGui.PopStyleVar( 3 ); ImGui.PopStyleVar( 3 );
@ -578,13 +587,15 @@ namespace Penumbra.UI
return; return;
} }
_selectorFactor = _base._plugin.Configuration.ScaleModSelector ? ImGui.GetWindowWidth() / SettingsMenu.MinSettingsSize.X : 1f;
// Selector pane // Selector pane
ImGui.BeginGroup(); ImGui.BeginGroup();
ImGui.PushStyleVar( ImGuiStyleVar.ItemSpacing, ZeroVector ); ImGui.PushStyleVar( ImGuiStyleVar.ItemSpacing, ZeroVector );
DrawModsSelectorFilter(); DrawModsSelectorFilter();
// Inlay selector list // Inlay selector list
ImGui.BeginChild( LabelSelectorList, new Vector2( SelectorPanelWidth, -ImGui.GetFrameHeightWithSpacing() ), true ); ImGui.BeginChild( LabelSelectorList, new Vector2( SelectorPanelWidth * _selectorFactor, -ImGui.GetFrameHeightWithSpacing() ),
true, ImGuiWindowFlags.HorizontalScrollbar );
ImGui.PushStyleVar( ImGuiStyleVar.IndentSpacing, 12.5f ); ImGui.PushStyleVar( ImGuiStyleVar.IndentSpacing, 12.5f );
for( var modIndex = 0; modIndex < Mods!.Count; ) for( var modIndex = 0; modIndex < Mods!.Count; )

15
Penumbra/UI/MenuTabs/TabSettings.cs
View file

@ -20,6 +20,7 @@ namespace Penumbra.UI
private const string LabelOpenFolder = "Open Mods Folder"; private const string LabelOpenFolder = "Open Mods Folder";
private const string LabelEnabled = "Enable Mods"; private const string LabelEnabled = "Enable Mods";
private const string LabelEnabledPlayerWatch = "Enable automatic Character Redraws"; private const string LabelEnabledPlayerWatch = "Enable automatic Character Redraws";
private const string LabelScaleModSelector = "Scale Mod Selector With Window Size";
private const string LabelShowAdvanced = "Show Advanced Settings"; private const string LabelShowAdvanced = "Show Advanced Settings";
private const string LabelLogLoadedFiles = "Log all loaded files"; private const string LabelLogLoadedFiles = "Log all loaded files";
private const string LabelDisableNotifications = "Disable filesystem change notifications"; private const string LabelDisableNotifications = "Disable filesystem change notifications";
@ -97,6 +98,16 @@ namespace Penumbra.UI
} }
} }
private void DrawScaleModSelectorBox()
{
var scaleModSelector = _config.ScaleModSelector;
if( ImGui.Checkbox( LabelScaleModSelector, ref scaleModSelector ) )
{
_config.ScaleModSelector = scaleModSelector;
_configChanged = true;
}
}
private void DrawLogLoadedFilesBox() private void DrawLogLoadedFilesBox()
{ {
ImGui.Checkbox( LabelLogLoadedFiles, ref _base._plugin.ResourceLoader.LogAllFiles ); ImGui.Checkbox( LabelLogLoadedFiles, ref _base._plugin.ResourceLoader.LogAllFiles );
@ -158,7 +169,8 @@ namespace Penumbra.UI
if( ImGui.IsItemHovered() ) if( ImGui.IsItemHovered() )
{ {
ImGui.SetTooltip( "If this setting is enabled, penumbra will keep tabs on characters that have a corresponding collection setup in the Collections tab.\n" ImGui.SetTooltip(
"If this setting is enabled, penumbra will keep tabs on characters that have a corresponding collection setup in the Collections tab.\n"
+ "Penumbra will try to automatically redraw those characters using their collection when they first appear in an instance, or when they change their current equip." ); + "Penumbra will try to automatically redraw those characters using their collection when they first appear in an instance, or when they change their current equip." );
} }
} }
@ -198,6 +210,7 @@ namespace Penumbra.UI
DrawEnabledPlayerWatcher(); DrawEnabledPlayerWatcher();
Custom.ImGuiCustom.VerticalDistance( DefaultVerticalSpace ); Custom.ImGuiCustom.VerticalDistance( DefaultVerticalSpace );
DrawScaleModSelectorBox();
DrawShowAdvancedBox(); DrawShowAdvancedBox();
if( _config.ShowAdvanced ) if( _config.ShowAdvanced )

4
Penumbra/UI/SettingsMenu.cs
View file

@ -11,8 +11,8 @@ namespace Penumbra.UI
{ {
private const string PenumbraSettingsLabel = "PenumbraSettings"; private const string PenumbraSettingsLabel = "PenumbraSettings";
private static readonly Vector2 MinSettingsSize = new( 800, 450 ); public static readonly Vector2 MinSettingsSize = new( 800, 450 );
private static readonly Vector2 MaxSettingsSize = new( 69420, 42069 ); public static readonly Vector2 MaxSettingsSize = new( 69420, 42069 );
private readonly SettingsInterface _base; private readonly SettingsInterface _base;
private readonly TabSettings _settingsTab; private readonly TabSettings _settingsTab;