Change order of buttons in macro list

This commit is contained in:
Asriel Camora
2023-11-18 01:07:13 -08:00
parent 6a3065e0c0
commit d186c426b3
+19 -16
View File
@@ -35,7 +35,7 @@ public sealed class MacroList : Window, IDisposable
CollapsedCondition = ImGuiCond.Appearing; CollapsedCondition = ImGuiCond.Appearing;
Collapsed = false; Collapsed = false;
SizeConstraints = new() { MinimumSize = new(500, 520), MaximumSize = new(float.PositiveInfinity) }; SizeConstraints = new() { MinimumSize = new(465, 520), MaximumSize = new(float.PositiveInfinity) };
TitleBarButtons = new() TitleBarButtons = new()
{ {
@@ -83,7 +83,7 @@ public sealed class MacroList : Window, IDisposable
ImGui.InvisibleButton($"###macroButton{i}", ImGui.GetItemRectSize()); ImGui.InvisibleButton($"###macroButton{i}", ImGui.GetItemRectSize());
if (isUnsorted) if (isUnsorted)
{ {
using (var _source = ImRaii.DragDropSource()) using (var _source = ImRaii.DragDropSource(ImGuiDragDropFlags.SourceNoDisableHover))
{ {
if (_source) if (_source)
{ {
@@ -236,31 +236,34 @@ public sealed class MacroList : Window, IDisposable
ImGui.TableNextColumn(); ImGui.TableNextColumn();
{ {
if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Paste, miniRowHeight)) if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Edit, miniRowHeight))
Service.Plugin.CopyMacro(macro.Actions); OpenEditor(macro);
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGui.SetTooltip("Copy to Clipboard"); ImGui.SetTooltip("Open in Simulator");
ImGui.SameLine(); ImGui.SameLine(0, spacing);
if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Trash, miniRowHeight) && ImGui.GetIO().KeyShift)
Service.Configuration.RemoveMacro(macro);
if (ImGui.IsItemHovered())
ImGui.SetTooltip("Delete (Hold Shift)");
if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.PencilAlt, miniRowHeight)) if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.PencilAlt, miniRowHeight))
ShowRenamePopup(macro); ShowRenamePopup(macro);
DrawRenamePopup(macro); DrawRenamePopup(macro);
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGui.SetTooltip("Rename"); ImGui.SetTooltip("Rename");
ImGui.SameLine();
if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Edit, miniRowHeight)) if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Paste, miniRowHeight))
OpenEditor(macro); Service.Plugin.CopyMacro(macro.Actions);
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGui.SetTooltip("Open in Simulator"); ImGui.SetTooltip("Copy to Clipboard");
ImGui.SameLine(0, spacing);
using (var _disabled = ImRaii.Disabled(!ImGui.GetIO().KeyShift))
{
if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Trash, miniRowHeight))
Service.Configuration.RemoveMacro(macro);
}
if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
ImGui.SetTooltip("Delete (Hold Shift)");
} }
ImGui.TableNextColumn(); ImGui.TableNextColumn();
{ {
var itemsPerRow = (int)MathF.Floor((ImGui.GetContentRegionAvail().X - stepsAvailWidthOffset + spacing) / (miniRowHeight + spacing)); var itemsPerRow = (int)MathF.Floor((ImGui.GetContentRegionAvail().X - stepsAvailWidthOffset + spacing * 2) / (miniRowHeight + spacing));
var itemCount = macro.Actions.Count; var itemCount = macro.Actions.Count;
for (var i = 0; i < itemsPerRow * 2; i++) for (var i = 0; i < itemsPerRow * 2; i++)
{ {