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

Improve option select combo.

Browse source
This commit is contained in:
Ottermandias 2025-05-18 12:54:09 +02:00
parent 3078c467d0
commit fbc4c2d054
2 changed files with 95 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

63
Penumbra/UI/AdvancedWindow/ModEditWindow.cs
View file

@ -7,9 +7,11 @@ using Dalamud.Plugin.Services;
using ImGuiNET; using ImGuiNET;
using OtterGui; using OtterGui;
using OtterGui.Extensions; using OtterGui.Extensions;
using OtterGui.Log;
using OtterGui.Raii; using OtterGui.Raii;
using OtterGui.Services; using OtterGui.Services;
using OtterGui.Text; using OtterGui.Text;
using OtterGui.Widgets;
using Penumbra.Api.Enums; using Penumbra.Api.Enums;
using Penumbra.Collections.Manager; using Penumbra.Collections.Manager;
using Penumbra.Communication; using Penumbra.Communication;
@ -34,6 +36,41 @@ using MdlMaterialEditor = Penumbra.Mods.Editor.MdlMaterialEditor;
namespace Penumbra.UI.AdvancedWindow; namespace Penumbra.UI.AdvancedWindow;
public sealed class OptionSelectCombo(ModEditor editor, ModEditWindow window)
: FilterComboCache<(string FullName, (int Group, int Data) Index)>(
() => window.Mod!.AllDataContainers.Select(c => (c.GetFullName(), c.GetDataIndices())).ToList(), MouseWheelType.Control, Penumbra.Log)
{
private ImRaii.ColorStyle _border;
protected override void DrawCombo(string label, string preview, string tooltip, int currentSelected, float previewWidth, float itemHeight,
ImGuiComboFlags flags)
{
_border = ImRaii.PushFrameBorder(ImUtf8.GlobalScale, ColorId.FolderLine.Value());
base.DrawCombo(label, preview, tooltip, currentSelected, previewWidth, itemHeight, flags);
_border.Dispose();
}
protected override void DrawFilter(int currentSelected, float width)
{
_border.Dispose();
base.DrawFilter(currentSelected, width);
}
public bool Draw(float width)
{
var flags = window.Mod!.AllDataContainers.Count() switch
{
0 => ImGuiComboFlags.NoArrowButton,
> 8 => ImGuiComboFlags.HeightLargest,
_ => ImGuiComboFlags.None,
};
return Draw("##optionSelector", editor.Option!.GetFullName(), string.Empty, width, ImGui.GetTextLineHeight(), flags);
}
protected override bool DrawSelectable(int globalIdx, bool selected)
=> ImUtf8.Selectable(Items[globalIdx].FullName, selected);
}
public partial class ModEditWindow : Window, IDisposable, IUiService public partial class ModEditWindow : Window, IDisposable, IUiService
{ {
private const string WindowBaseLabel = "###SubModEdit"; private const string WindowBaseLabel = "###SubModEdit";
@ -49,6 +86,7 @@ public partial class ModEditWindow : Window, IDisposable, IUiService
private readonly IDragDropManager _dragDropManager; private readonly IDragDropManager _dragDropManager;
private readonly IDataManager _gameData; private readonly IDataManager _gameData;
private readonly IFramework _framework; private readonly IFramework _framework;
private readonly OptionSelectCombo _optionSelect;
private Vector2 _iconSize = Vector2.Zero; private Vector2 _iconSize = Vector2.Zero;
private bool _allowReduplicate; private bool _allowReduplicate;
@ -208,7 +246,7 @@ public partial class ModEditWindow : Window, IDisposable, IUiService
if (IsLoading) if (IsLoading)
{ {
var radius = 100 * ImUtf8.GlobalScale; var radius = 100 * ImUtf8.GlobalScale;
var thickness = (int) (20 * ImUtf8.GlobalScale); var thickness = (int)(20 * ImUtf8.GlobalScale);
var offsetX = ImGui.GetContentRegionAvail().X / 2 - radius; var offsetX = ImGui.GetContentRegionAvail().X / 2 - radius;
var offsetY = ImGui.GetContentRegionAvail().Y / 2 - radius; var offsetY = ImGui.GetContentRegionAvail().Y / 2 - radius;
ImGui.SetCursorPos(ImGui.GetCursorPos() + new Vector2(offsetX, offsetY)); ImGui.SetCursorPos(ImGui.GetCursorPos() + new Vector2(offsetX, offsetY));
@ -216,7 +254,7 @@ public partial class ModEditWindow : Window, IDisposable, IUiService
return; return;
} }
using var tabBar = ImRaii.TabBar("##tabs"); using var tabBar = ImUtf8.TabBar("##tabs"u8);
if (!tabBar) if (!tabBar)
return; return;
@ -231,7 +269,7 @@ public partial class ModEditWindow : Window, IDisposable, IUiService
_materialTab.Draw(); _materialTab.Draw();
DrawTextureTab(); DrawTextureTab();
_shaderPackageTab.Draw(); _shaderPackageTab.Draw();
using (var tab = ImRaii.TabItem("Item Swap")) using (var tab = ImUtf8.TabItem("Item Swap"u8))
{ {
if (tab) if (tab)
_itemSwapTab.DrawContent(); _itemSwapTab.DrawContent();
@ -456,7 +494,8 @@ public partial class ModEditWindow : Window, IDisposable, IUiService
using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, Vector2.Zero).Push(ImGuiStyleVar.FrameRounding, 0); using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, Vector2.Zero).Push(ImGuiStyleVar.FrameRounding, 0);
var width = new Vector2(ImGui.GetContentRegionAvail().X / 3, 0); var width = new Vector2(ImGui.GetContentRegionAvail().X / 3, 0);
var ret = false; var ret = false;
if (ImUtf8.ButtonEx("Default Option"u8, "Switch to the default option for the mod.\nThis resets unsaved changes."u8, width, _editor.Option is DefaultSubMod)) if (ImUtf8.ButtonEx("Default Option"u8, "Switch to the default option for the mod.\nThis resets unsaved changes."u8, width,
_editor.Option is DefaultSubMod))
{ {
_editor.LoadOption(-1, 0).Wait(); _editor.LoadOption(-1, 0).Wait();
ret = true; ret = true;
@ -470,23 +509,12 @@ public partial class ModEditWindow : Window, IDisposable, IUiService
} }
ImGui.SameLine(); ImGui.SameLine();
ImGui.SetNextItemWidth(width.X); if (_optionSelect.Draw(width.X))
style.Push(ImGuiStyleVar.FrameBorderSize, ImGuiHelpers.GlobalScale);
using var color = ImRaii.PushColor(ImGuiCol.Border, ColorId.FolderLine.Value());
using var combo = ImUtf8.Combo("##optionSelector"u8, _editor.Option!.GetFullName());
if (!combo)
return ret;
foreach (var (option, idx) in Mod!.AllDataContainers.WithIndex())
{ {
using var id = ImRaii.PushId(idx); var (groupIdx, dataIdx) = _optionSelect.CurrentSelection.Index;
if (ImGui.Selectable(option.GetFullName(), option == _editor.Option))
{
var (groupIdx, dataIdx) = option.GetDataIndices();
_editor.LoadOption(groupIdx, dataIdx).Wait(); _editor.LoadOption(groupIdx, dataIdx).Wait();
ret = true; ret = true;
} }
}
return ret; return ret;
} }
@ -656,6 +684,7 @@ public partial class ModEditWindow : Window, IDisposable, IUiService
_fileDialog = fileDialog; _fileDialog = fileDialog;
_framework = framework; _framework = framework;
_metaDrawers = metaDrawers; _metaDrawers = metaDrawers;
_optionSelect = new OptionSelectCombo(editor, this);
_materialTab = new FileEditor<MtrlTab>(this, _communicator, gameData, config, _editor.Compactor, _fileDialog, "Materials", ".mtrl", _materialTab = new FileEditor<MtrlTab>(this, _communicator, gameData, config, _editor.Compactor, _fileDialog, "Materials", ".mtrl",
() => PopulateIsOnPlayer(_editor.Files.Mtrl, ResourceType.Mtrl), DrawMaterialPanel, () => Mod?.ModPath.FullName ?? string.Empty, () => PopulateIsOnPlayer(_editor.Files.Mtrl, ResourceType.Mtrl), DrawMaterialPanel, () => Mod?.ModPath.FullName ?? string.Empty,
(bytes, path, writable) => mtrlTabFactory.Create(this, new MtrlFile(bytes), path, writable)); (bytes, path, writable) => mtrlTabFactory.Create(this, new MtrlFile(bytes), path, writable));

43
Penumbra/UI/AdvancedWindow/OptionSelectCombo.cs Normal file
View file

@ -0,0 +1,43 @@
using ImGuiNET;
using OtterGui.Raii;
using OtterGui.Text;
using OtterGui.Widgets;
using Penumbra.Mods.Editor;
using Penumbra.UI.Classes;
namespace Penumbra.UI.AdvancedWindow;
public sealed class OptionSelectCombo(ModEditor editor, ModEditWindow window)
: FilterComboCache<(string FullName, (int Group, int Data) Index)>(
() => window.Mod!.AllDataContainers.Select(c => (c.GetFullName(), c.GetDataIndices())).ToList(), MouseWheelType.Control, Penumbra.Log)
{
private ImRaii.ColorStyle _border;
protected override void DrawCombo(string label, string preview, string tooltip, int currentSelected, float previewWidth, float itemHeight,
ImGuiComboFlags flags)
{
_border = ImRaii.PushFrameBorder(ImUtf8.GlobalScale, ColorId.FolderLine.Value());
base.DrawCombo(label, preview, tooltip, currentSelected, previewWidth, itemHeight, flags);
_border.Dispose();
}
protected override void DrawFilter(int currentSelected, float width)
{
_border.Dispose();
base.DrawFilter(currentSelected, width);
}
public bool Draw(float width)
{
var flags = window.Mod!.AllDataContainers.Count() switch
{
0 => ImGuiComboFlags.NoArrowButton,
> 8 => ImGuiComboFlags.HeightLargest,
_ => ImGuiComboFlags.None,
};
return Draw("##optionSelector", editor.Option!.GetFullName(), string.Empty, width, ImGui.GetTextLineHeight(), flags);
}
protected override bool DrawSelectable(int globalIdx, bool selected)
=> ImUtf8.Selectable(Items[globalIdx].FullName, selected);
}