fix: move selection with tab

This commit is contained in:
Anna 2022-02-08 19:06:24 -05:00
parent e891c75203
commit bcd23cecec
Signed by: anna
GPG Key ID: 0B391D8F06FCD9E0

View File

@ -11,6 +11,8 @@ internal sealed class Tabs : ISettingsTab {
public string Name => Language.Options_Tabs_Tab + "###tabs-tabs"; public string Name => Language.Options_Tabs_Tab + "###tabs-tabs";
private int _toOpen = -2;
internal Tabs(Configuration mutable) { internal Tabs(Configuration mutable) {
this.Mutable = mutable; this.Mutable = mutable;
} }
@ -41,26 +43,34 @@ internal sealed class Tabs : ISettingsTab {
} }
var toRemove = -1; var toRemove = -1;
var doOpens = this._toOpen > -2;
for (var i = 0; i < this.Mutable.Tabs.Count; i++) { for (var i = 0; i < this.Mutable.Tabs.Count; i++) {
var tab = this.Mutable.Tabs[i]; var tab = this.Mutable.Tabs[i];
if (doOpens) {
ImGui.SetNextItemOpen(i == this._toOpen);
}
if (ImGui.TreeNodeEx($"{tab.Name}###tab-{i}")) { if (ImGui.TreeNodeEx($"{tab.Name}###tab-{i}")) {
ImGui.PushID($"tab-{i}"); ImGui.PushID($"tab-{i}");
if (ImGuiUtil.IconButton(FontAwesomeIcon.TrashAlt, tooltip: Language.Options_Tabs_Delete)) { if (ImGuiUtil.IconButton(FontAwesomeIcon.TrashAlt, tooltip: Language.Options_Tabs_Delete)) {
toRemove = i; toRemove = i;
this._toOpen = -1;
} }
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ArrowUp, tooltip: Language.Options_Tabs_MoveUp) && i > 0) { if (ImGuiUtil.IconButton(FontAwesomeIcon.ArrowUp, tooltip: Language.Options_Tabs_MoveUp) && i > 0) {
(this.Mutable.Tabs[i - 1], this.Mutable.Tabs[i]) = (this.Mutable.Tabs[i], this.Mutable.Tabs[i - 1]); (this.Mutable.Tabs[i - 1], this.Mutable.Tabs[i]) = (this.Mutable.Tabs[i], this.Mutable.Tabs[i - 1]);
this._toOpen = i - 1;
} }
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ArrowDown, tooltip: Language.Options_Tabs_MoveDown) && i < this.Mutable.Tabs.Count - 1) { if (ImGuiUtil.IconButton(FontAwesomeIcon.ArrowDown, tooltip: Language.Options_Tabs_MoveDown) && i < this.Mutable.Tabs.Count - 1) {
(this.Mutable.Tabs[i + 1], this.Mutable.Tabs[i]) = (this.Mutable.Tabs[i], this.Mutable.Tabs[i + 1]); (this.Mutable.Tabs[i + 1], this.Mutable.Tabs[i]) = (this.Mutable.Tabs[i], this.Mutable.Tabs[i + 1]);
this._toOpen = i + 1;
} }
ImGui.InputText(Language.Options_Tabs_Name, ref tab.Name, 512, ImGuiInputTextFlags.EnterReturnsTrue); ImGui.InputText(Language.Options_Tabs_Name, ref tab.Name, 512, ImGuiInputTextFlags.EnterReturnsTrue);
@ -150,5 +160,9 @@ internal sealed class Tabs : ISettingsTab {
if (toRemove > -1) { if (toRemove > -1) {
this.Mutable.Tabs.RemoveAt(toRemove); this.Mutable.Tabs.RemoveAt(toRemove);
} }
if (doOpens) {
this._toOpen = -2;
}
} }
} }