Minor UI fixes

This commit is contained in:
Asriel Camora
2024-06-22 16:25:09 -07:00
parent 92bfaba783
commit c030babdd3
3 changed files with 24 additions and 23 deletions
-7
View File
@@ -1242,9 +1242,6 @@ public sealed class MacroEditor : Window, IDisposable
{ {
using var _disabled = ImRaii.Disabled(); using var _disabled = ImRaii.Disabled();
ImGui.Button("Stopping", new(halfWidth, height)); ImGui.Button("Stopping", new(halfWidth, height));
if (ImGui.IsItemHovered())
ImGuiUtils.Tooltip("This might could a while, sorry! Please report " +
"if this takes longer than a second.");
} }
else else
{ {
@@ -1256,10 +1253,6 @@ public sealed class MacroEditor : Window, IDisposable
{ {
if (ImGui.Button(SolverStartStepCount.HasValue ? "Regenerate" : "Generate", new(halfWidth, height))) if (ImGui.Button(SolverStartStepCount.HasValue ? "Regenerate" : "Generate", new(halfWidth, height)))
CalculateBestMacro(); CalculateBestMacro();
if (ImGui.IsItemHovered())
ImGuiUtils.Tooltip("Suggest a way to finish the crafting recipe. " +
"Results aren't perfect, and levels of success " +
"can vary wildly depending on the solver's settings.");
} }
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Paste)) if (ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Paste))
+6
View File
@@ -801,6 +801,10 @@ public sealed unsafe class RecipeNote : Window, IDisposable
ImGuiUtils.AlignMiddle(size, availSize); ImGuiUtils.AlignMiddle(size, availSize);
if (ImGui.Button("Generate")) if (ImGui.Button("Generate"))
CalculateSuggestedMacro(); CalculateSuggestedMacro();
if (ImGui.IsItemHovered())
ImGuiUtils.TooltipWrapped("Suggest a way to finish the crafting recipe. " +
"Results aren't perfect, and levels of success " +
"can vary wildly depending on the solver's settings.");
ImGui.SetCursorPos(c + new Vector2(0, availSize.Y + ImGui.GetStyle().ItemSpacing.Y)); ImGui.SetCursorPos(c + new Vector2(0, availSize.Y + ImGui.GetStyle().ItemSpacing.Y));
break; break;
} }
@@ -813,6 +817,8 @@ public sealed unsafe class RecipeNote : Window, IDisposable
ImGuiUtils.AlignMiddle(size, availSize); ImGuiUtils.AlignMiddle(size, availSize);
if (ImGui.Button("Search Online")) if (ImGui.Button("Search Online"))
CalculateCommunityMacro(); CalculateCommunityMacro();
if (ImGui.IsItemHovered())
ImGuiUtils.TooltipWrapped("Searches FFXIV Teamcraft to find you the best macro");
ImGui.SetCursorPos(c + new Vector2(0, availSize.Y + ImGui.GetStyle().ItemSpacing.Y)); ImGui.SetCursorPos(c + new Vector2(0, availSize.Y + ImGui.GetStyle().ItemSpacing.Y));
break; break;
} }
+18 -16
View File
@@ -272,10 +272,9 @@ public sealed class Settings : Window, IDisposable
} }
DrawOption( DrawOption(
"Use Macro Chain's /nextmacro", "Use Macro Chain",
"Replaces the last step with /nextmacro to run the next macro " + "Replaces the last step with /nextmacro to run the next macro " +
"automatically. Overrides Add End Notification except for the " + "automatically. Overrides the Intermediate Notification Sound.",
"last macro.",
Config.MacroCopy.UseNextMacro, Config.MacroCopy.UseNextMacro,
v => Config.MacroCopy.UseNextMacro = v, v => Config.MacroCopy.UseNextMacro = v,
ref isDirty ref isDirty
@@ -337,19 +336,22 @@ public sealed class Settings : Window, IDisposable
if (Config.MacroCopy.AddNotificationSound) if (Config.MacroCopy.AddNotificationSound)
{ {
DrawOption( using (var d = ImRaii.Disabled(Config.MacroCopy.UseNextMacro))
"Intermediate Notification Sound", {
"Ending notification sound for an intermediary macro.\n" + DrawOption(
"Uses <se.#>", "Intermediate Notification Sound",
Config.MacroCopy.IntermediateNotificationSound, "Ending notification sound for an intermediary macro.\n" +
1, 16, "Uses <se.#>",
v => Config.MacroCopy.IntermediateNotificationSound,
{ 1, 16,
Config.MacroCopy.IntermediateNotificationSound = v; v =>
UIModule.PlayChatSoundEffect((uint)v); {
}, Config.MacroCopy.IntermediateNotificationSound = v;
ref isDirty UIModule.PlayChatSoundEffect((uint)v);
); },
ref isDirty
);
}
DrawOption( DrawOption(
"Final Notification Sound", "Final Notification Sound",