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

Bug fixes for group selection in installed mods tab.

Browse source
This commit is contained in:
Ottermandias 2021-02-15 14:02:22 +01:00
parent b9a9e30388
commit 5f9281384d
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Penumbra/UI/TabInstalledDetails.cs
View file

@ -377,9 +377,11 @@ namespace Penumbra.UI
if (_selectedOption == null) if (_selectedOption == null)
SelectOption(); SelectOption();
DrawEditGroupSelector(); if (!DrawEditGroupSelector())
return;
ImGui.SameLine(); ImGui.SameLine();
DrawEditOptionSelector(); if (!DrawEditOptionSelector())
return;
ImGui.SameLine(); ImGui.SameLine();
DrawAddToGroupButton(); DrawAddToGroupButton();
ImGui.SameLine(); ImGui.SameLine();

13
Penumbra/UI/TabInstalledDetailsEdit.cs
View file

@ -15,7 +15,7 @@ namespace Penumbra.UI
private const string LabelNewMultiGroup = "New Multi Group"; private const string LabelNewMultiGroup = "New Multi Group";
private const string LabelGamePathsEdit = "Game Paths"; private const string LabelGamePathsEdit = "Game Paths";
private const string LabelGamePathsEditBox = "##gamePathsEdit"; private const string LabelGamePathsEditBox = "##gamePathsEdit";
private const string TextNoOptionAvailable = "[No Option Available]"; private const string TextNoOptionAvailable = "[Not Available]";
private const string ButtonAddToGroup = "Add to Group"; private const string ButtonAddToGroup = "Add to Group";
private const string ButtonRemoveFromGroup = "Remove from Group"; private const string ButtonRemoveFromGroup = "Remove from Group";
private const string TooltipAboutEdit = "Use Ctrl+Enter for newlines."; private const string TooltipAboutEdit = "Use Ctrl+Enter for newlines.";
@ -27,12 +27,13 @@ namespace Penumbra.UI
private const float MultiEditBoxWidth = 300f; private const float MultiEditBoxWidth = 300f;
private void DrawEditGroupSelector() private bool DrawEditGroupSelector()
{ {
ImGui.SetNextItemWidth( OptionSelectionWidth ); ImGui.SetNextItemWidth( OptionSelectionWidth );
if (Meta.Groups.Count == 0) if (Meta.Groups.Count == 0)
{ {
ImGui.Combo( LabelGroupSelect, ref _selectedGroupIndex, TextNoOptionAvailable, 1); ImGui.Combo( LabelGroupSelect, ref _selectedGroupIndex, TextNoOptionAvailable, 1);
return false;
} }
else else
{ {
@ -42,21 +43,23 @@ namespace Penumbra.UI
SelectOption(0); SelectOption(0);
} }
} }
return true;
} }
private void DrawEditOptionSelector() private bool DrawEditOptionSelector()
{ {
ImGui.SameLine(); ImGui.SameLine();
ImGui.SetNextItemWidth( OptionSelectionWidth ); ImGui.SetNextItemWidth( OptionSelectionWidth );
if (_selectedGroup?.Options.Count == 0) if ((_selectedGroup?.Options.Count ?? 0) == 0)
{ {
ImGui.Combo( LabelOptionSelect, ref _selectedOptionIndex, TextNoOptionAvailable, 1); ImGui.Combo( LabelOptionSelect, ref _selectedOptionIndex, TextNoOptionAvailable, 1);
return; return false;
} }
var group = (InstallerInfo) _selectedGroup; var group = (InstallerInfo) _selectedGroup;
if (ImGui.Combo( LabelOptionSelect, ref _selectedOptionIndex, group.Options.Select(O => O.OptionName).ToArray(), group.Options.Count)) if (ImGui.Combo( LabelOptionSelect, ref _selectedOptionIndex, group.Options.Select(O => O.OptionName).ToArray(), group.Options.Count))
SelectOption(); SelectOption();
return true;
} }
private void DrawFileListTabEdit() private void DrawFileListTabEdit()