Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

Let shortcut capture cancel clicks through

George Pickettc54cfb9244f9
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swift
index b431df33..63941339 100644
--- a/Sources/Fluid/ContentView.swift
+++ b/Sources/Fluid/ContentView.swift
@@ -722,6 +722,12 @@ struct ContentView: View {
let newShortcut = HotkeyShortcut(mouseButton: event.buttonNumber, modifierFlags: self.pendingModifierFlags.union(eventModifiers))
DebugLogger.shared.debug("NSEvent monitor: Recording new mouse shortcut: \(newShortcut.displayString)", source: "ContentView")
+ if newShortcut.isUnmodifiedLeftOrRightClick, let mouseButton = newShortcut.mouseButton {
+ self.shortcutRecordingMessage = "\(HotkeyShortcut.mouseButtonToString(mouseButton)) needs a modifier key"
+ self.resetPendingShortcutState()
+ return event
+ }
+
if let recordingTarget,
let conflictMessage = self.shortcutConflictMessage(for: newShortcut, target: recordingTarget)
{
diff --git a/Sources/Fluid/UI/SettingsView.swift b/Sources/Fluid/UI/SettingsView.swift
index 1b5de41d..23a7f47c 100644
--- a/Sources/Fluid/UI/SettingsView.swift
+++ b/Sources/Fluid/UI/SettingsView.swift
@@ -2061,6 +2061,7 @@ struct SettingsView: View {
.toggleStyle(.switch)
.tint(self.theme.palette.accent)
.labelsHidden()
+ .disabled(isAnyRecordingActive)
}
}
@@ -2093,12 +2094,17 @@ struct SettingsView: View {
)
}
- Button("Change") {
- onChangePressed()
+ Button(isRecording ? "Cancel" : "Change") {
+ if isRecording {
+ self.shortcutRecordingMessage = nil
+ self.activeShortcutRecordingTarget = nil
+ } else {
+ onChangePressed()
+ }
}
.buttonStyle(.bordered)
.controlSize(.small)
- .disabled(isAnyRecordingActive || !enabledValue)
+ .disabled(!isRecording && (isAnyRecordingActive || !enabledValue))
if isRecording, let recordingMessage, !recordingMessage.isEmpty {
Text(recordingMessage)