Add option to display single select groups as radio buttons.

This commit is contained in:
Ottermandias 2023-02-23 18:29:54 +01:00
parent ebbc3fed86
commit 47ddca0506
3 changed files with 99 additions and 32 deletions

View file

@ -68,6 +68,7 @@ public partial class Configuration : IPluginConfiguration
public float ModSelectorAbsoluteSize { get; set; } = Constants.DefaultAbsoluteSize;
public int ModSelectorScaledSize { get; set; } = Constants.DefaultScaledSize;
public bool OpenFoldersByDefault { get; set; } = false;
public int SingleGroupRadioMax { get; set; } = 2;
public string DefaultImportFolder { get; set; } = string.Empty;
public DoubleModifier DeleteModModifier { get; set; } = new(ModifierHotkey.Control, ModifierHotkey.Shift);

View file

@ -64,19 +64,27 @@ public partial class ConfigWindow
if( _mod.Groups.Count > 0 )
{
var useDummy = true;
foreach( var (group, idx) in _mod.Groups.WithIndex().Where( g => g.Value.Type == GroupType.Single && g.Value.IsOption ) )
foreach( var (group, idx) in _mod.Groups.WithIndex().Where( g => g.Value.Type == GroupType.Single && g.Value.Count > Penumbra.Config.SingleGroupRadioMax ) )
{
ImGuiUtil.Dummy( _window._defaultSpace, useDummy );
useDummy = false;
DrawSingleGroup( group, idx );
DrawSingleGroupCombo( group, idx );
}
useDummy = true;
foreach( var (group, idx) in _mod.Groups.WithIndex().Where( g => g.Value.Type == GroupType.Multi && g.Value.IsOption ) )
foreach( var (group, idx) in _mod.Groups.WithIndex().Where( g => g.Value.IsOption ) )
{
ImGuiUtil.Dummy( _window._defaultSpace, useDummy );
useDummy = false;
switch( group.Type )
{
case GroupType.Multi:
DrawMultiGroup( group, idx );
break;
case GroupType.Single when group.Count <= Penumbra.Config.SingleGroupRadioMax:
DrawSingleGroupRadio( group, idx );
break;
}
}
}
@ -162,14 +170,16 @@ public partial class ConfigWindow
+ "If no inherited collection has settings for this mod, it will be disabled." );
}
// Draw a single group selector as a combo box.
// If a description is provided, add a help marker besides it.
private void DrawSingleGroup( IModGroup group, int groupIdx )
private void DrawSingleGroupCombo( IModGroup group, int groupIdx )
{
using var id = ImRaii.PushId( groupIdx );
var selectedOption = _emptySetting ? ( int )group.DefaultSettings : ( int )_settings.Settings[ groupIdx ];
ImGui.SetNextItemWidth( _window._inputTextWidth.X * 3 / 4 );
using var combo = ImRaii.Combo( string.Empty, group[ selectedOption ].Name );
using( var combo = ImRaii.Combo( string.Empty, group[ selectedOption ].Name ) )
{
if( combo )
{
for( var idx2 = 0; idx2 < group.Count; ++idx2 )
@ -201,8 +211,8 @@ public partial class ConfigWindow
id.Pop();
}
}
}
combo.Dispose();
ImGui.SameLine();
if( group.Description.Length > 0 )
{
@ -214,6 +224,34 @@ public partial class ConfigWindow
}
}
// Draw a single group selector as a set of radio buttons.
// If a description is provided, add a help marker besides it.
private void DrawSingleGroupRadio( IModGroup group, int groupIdx )
{
using var id = ImRaii.PushId( groupIdx );
var selectedOption = _emptySetting ? ( int )group.DefaultSettings : ( int )_settings.Settings[ groupIdx ];
Widget.BeginFramedGroup( group.Name, group.Description );
for( var idx = 0; idx < group.Count; ++idx )
{
id.Push( idx );
var option = group[ idx ];
if( ImGui.RadioButton( option.Name, selectedOption == idx ) )
{
Penumbra.CollectionManager.Current.SetModSetting( _mod.Index, groupIdx, ( uint )idx );
}
if( option.Description.Length > 0 )
{
ImGui.SameLine();
ImGuiComponents.HelpMarker( option.Description );
}
id.Pop( idx );
}
Widget.EndFramedGroup();
}
// Draw a multi group selector as a bordered set of checkboxes.
// If a description is provided, add a help marker in the title.
private void DrawMultiGroup( IModGroup group, int groupIdx )
@ -221,11 +259,11 @@ public partial class ConfigWindow
using var id = ImRaii.PushId( groupIdx );
var flags = _emptySetting ? group.DefaultSettings : _settings.Settings[ groupIdx ];
Widget.BeginFramedGroup( group.Name, group.Description );
for( var idx2 = 0; idx2 < group.Count; ++idx2 )
for( var idx = 0; idx < group.Count; ++idx )
{
var option = group[ idx2 ];
id.Push( idx2 );
var flag = 1u << idx2;
var option = group[ idx ];
id.Push( idx );
var flag = 1u << idx;
var setting = ( flags & flag ) != 0;
if( ImGui.Checkbox( option.Name, ref setting ) )
{

View file

@ -27,6 +27,32 @@ public partial class ConfigWindow
ImGuiUtil.LabeledHelpMarker( label, tooltip );
}
private static int _singleGroupRadioMax = int.MaxValue;
private void DrawSingleSelectRadioMax()
{
if ( _singleGroupRadioMax == int.MaxValue)
_singleGroupRadioMax = Penumbra.Config.SingleGroupRadioMax;
ImGui.SetNextItemWidth( _window._inputTextWidth.X );
if( ImGui.DragInt( "##SingleSelectRadioMax", ref _singleGroupRadioMax, 0.01f, 1 ) )
{
_singleGroupRadioMax = Math.Max( 1, _singleGroupRadioMax );
}
if (ImGui.IsItemDeactivated())
{
if( _singleGroupRadioMax != Penumbra.Config.SingleGroupRadioMax )
{
Penumbra.Config.SingleGroupRadioMax = _singleGroupRadioMax;
Penumbra.Config.Save();
}
_singleGroupRadioMax = int.MaxValue;
}
ImGuiUtil.LabeledHelpMarker( "Upper Limit for Single-Selection Group Radio Buttons",
"All Single-Selection Groups with more options than specified here will be displayed as Combo-Boxes at the top.\n"
+ "All other Single-Selection Groups will be displayed as a set of Radio-Buttons." );
}
private void DrawModSelectorSettings()
{
#if DEBUG
@ -62,6 +88,7 @@ public partial class ConfigWindow
Dalamud.PluginInterface.UiBuilder.DisableGposeUiHide = !v;
} );
ImGui.Dummy( _window._defaultSpace );
Checkbox( "Hide Redraw Bar in Mod Panel", "Hides the lower redraw buttons in the mod panel in your Mods tab.",
Penumbra.Config.HideRedrawBar, v => Penumbra.Config.HideRedrawBar = v );
ImGui.Dummy( _window._defaultSpace );
@ -83,6 +110,7 @@ public partial class ConfigWindow
"Use the owner's name to determine the appropriate individual collection for mounts, companions, accessories and combat pets.",
Penumbra.Config.UseOwnerNameForCharacterCollection, v => Penumbra.Config.UseOwnerNameForCharacterCollection = v );
ImGui.Dummy( _window._defaultSpace );
DrawSingleSelectRadioMax();
DrawFolderSortType();
DrawAbsoluteSizeSelector();
DrawRelativeSizeSelector();