From c0ba4407b536f57ec4e39defb8ac03d63d5a59dd Mon Sep 17 00:00:00 2001 From: Asriel Camora Date: Tue, 24 Oct 2023 01:39:13 -0700 Subject: [PATCH] Add force notification warning --- Craftimizer/Utils/MacroCopy.cs | 2 +- Craftimizer/Windows/Settings.cs | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Craftimizer/Utils/MacroCopy.cs b/Craftimizer/Utils/MacroCopy.cs index e9f7df8..d8b382a 100644 --- a/Craftimizer/Utils/MacroCopy.cs +++ b/Craftimizer/Utils/MacroCopy.cs @@ -56,7 +56,7 @@ public static class MacroCopy } if (s.Count > 0) { - if (s.Count < MacroSize) + if (s.Count < MacroSize || (config.Type != MacroCopyConfiguration.CopyType.CopyToMacro && config.CombineMacro)) { if (GetEndCommand(macros.Count, true, config) is { } endCommand) s.Add(endCommand); diff --git a/Craftimizer/Windows/Settings.cs b/Craftimizer/Windows/Settings.cs index ff16a8e..a11ca3c 100644 --- a/Craftimizer/Windows/Settings.cs +++ b/Craftimizer/Windows/Settings.cs @@ -295,14 +295,20 @@ public sealed class Settings : Window, IDisposable if (Config.MacroCopy.AddNotification) { - DrawOption( - "Force Notification", - "Prioritize always having a notification sound at the end of\n" + - "every macro. Keeping this off prevents macros with only 1 action.", - Config.MacroCopy.ForceNotification, - v => Config.MacroCopy.ForceNotification = v, - ref isDirty - ); + var isForceUseful = Config.MacroCopy.Type == MacroCopyConfiguration.CopyType.CopyToMacro || !Config.MacroCopy.CombineMacro; + using (var d = ImRaii.Disabled(!isForceUseful)) + { + DrawOption( + "Force Notification", + "Prioritize always having a notification sound at the end of\n" + + "every macro. Keeping this off prevents macros with only 1 action.", + Config.MacroCopy.ForceNotification, + v => Config.MacroCopy.ForceNotification = v, + ref isDirty + ); + } + if (!isForceUseful && ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled)) + ImGui.SetTooltip("Only useful when Combine Macro is off"); DrawOption( "Add Notification Sound",