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
Fix modifier-only hotkeys triggering during key combos - Add 150ms delay before activating hold mode to detect key combinations - Trigger toggle mode on key release (not press) to avoid false triggers - Track if another key was pressed during modifier hold - Harden BottomOverlay and NotchContent UI for consistent dark appearance
altic-devae4b1755683f
diff --git a/Sources/Fluid/Services/GlobalHotkeyManager.swift b/Sources/Fluid/Services/GlobalHotkeyManager.swiftindex caf5e0d2..09d5c245 100644--- a/Sources/Fluid/Services/GlobalHotkeyManager.swift+++ b/Sources/Fluid/Services/GlobalHotkeyManager.swift@@ -21,6 +21,19 @@ final class GlobalHotkeyManager: NSObject {private var isCommandModeKeyPressed = falseprivate var isRewriteKeyPressed = false+ // Modifier-only shortcut tracking: detect if another key was pressed during modifier hold+ private var modifierOnlyKeyDown = false+ private var otherKeyPressedDuringModifier = false+ private var modifierPressStartTime: Date?+ private var pendingHoldModeStart: Task<Void, Never>?+ private var pendingHoldModeType: HoldModeType?++ private enum HoldModeType {+ case transcription+ case commandMode+ case rewriteMode+ }+// Busy flag to prevent race conditions during stop processingprivate var isProcessingStop = false@@ -249,6 +262,18 @@ final class GlobalHotkeyManager: NSObject {switch type {case .keyDown:+ // If a modifier-only shortcut key is being held and this is a different key, mark it+ if self.modifierOnlyKeyDown {+ self.otherKeyPressedDuringModifier = true+ // Cancel any pending hold mode start (user is doing a key combo, not just modifier)+ if let pending = self.pendingHoldModeStart {+ pending.cancel()+ self.pendingHoldModeStart = nil+ self.pendingHoldModeType = nil+ DebugLogger.shared.info("Another key pressed - cancelled pending hold mode start", source: "GlobalHotkeyManager")+ }+ }+// Check Escape key first (keyCode 53) - cancels recording and closes mode viewsif keyCode == 53, eventModifiers.isEmpty {var handled = false@@ -365,27 +390,63 @@ final class GlobalHotkeyManager: NSObject {// Check command mode shortcut (if it's a modifier-only shortcut)if self.commandModeShortcutEnabled, self.commandModeShortcut.modifierFlags.isEmpty, keyCode == self.commandModeShortcut.keyCode {if isModifierPressed {+ // Modifier pressed down+ self.modifierOnlyKeyDown = true+ self.otherKeyPressedDuringModifier = false+ self.modifierPressStartTime = Date()+if self.pressAndHoldMode {if !self.isCommandModeKeyPressed {self.isCommandModeKeyPressed = true- DebugLogger.shared.info("Command mode modifier pressed (hold mode) - starting", source: "GlobalHotkeyManager")- self.triggerCommandMode()+ // Delay start by 150ms to detect if this is a key combo+ self.pendingHoldModeStart?.cancel()+ self.pendingHoldModeType = .commandMode+ self.pendingHoldModeStart = Task { @MainActor [weak self] in+ try? await Task.sleep(nanoseconds: 150_000_000) // 150ms+ guard let self = self, !Task.isCancelled else { return }+ guard self.isCommandModeKeyPressed, !self.otherKeyPressedDuringModifier else {+ DebugLogger.shared.debug("Command mode hold start cancelled - key combo detected", source: "GlobalHotkeyManager")+ return+ }+ DebugLogger.shared.info("Command mode modifier held (hold mode) - starting after delay", source: "GlobalHotkeyManager")+ self.triggerCommandMode()+ }}- } else {- // Toggle mode+ }+ // Toggle mode: do NOT trigger yet, wait for release+ } else {+ // Modifier released+ let wasCleanPress = !self.otherKeyPressedDuringModifier+ self.modifierOnlyKeyDown = false+ self.otherKeyPressedDuringModifier = false+ self.modifierPressStartTime = nil++ if self.pressAndHoldMode {+ // Cancel pending start if not yet triggered+ self.pendingHoldModeStart?.cancel()+ self.pendingHoldModeStart = nil+ self.pendingHoldModeType = nil++ if self.isCommandModeKeyPressed {+ self.isCommandModeKeyPressed = false+ // Only stop if recording actually started+ if self.asrService.isRunning {+ DebugLogger.shared.info("Command mode modifier released (hold mode) - stopping", source: "GlobalHotkeyManager")+ self.stopRecordingIfNeeded()+ }+ }+ } else if wasCleanPress {+ // Toggle mode: only trigger on release if no other key was pressedif self.asrService.isRunning {- DebugLogger.shared.info("Command mode modifier pressed while recording - stopping", source: "GlobalHotkeyManager")+ DebugLogger.shared.info("Command mode modifier released (toggle) - stopping", source: "GlobalHotkeyManager")self.stopRecordingIfNeeded()} else {- DebugLogger.shared.info("Command mode modifier pressed - starting", source: "GlobalHotkeyManager")+ DebugLogger.shared.info("Command mode modifier released (toggle) - starting", source: "GlobalHotkeyManager")self.triggerCommandMode()}+ } else {+ DebugLogger.shared.debug("Command mode modifier released but another key was pressed - ignoring", source: "GlobalHotkeyManager")}- } else if self.pressAndHoldMode, self.isCommandModeKeyPressed {- // Key released in press-and-hold mode- self.isCommandModeKeyPressed = false- DebugLogger.shared.info("Command mode modifier released (hold mode) - stopping", source: "GlobalHotkeyManager")- self.stopRecordingIfNeeded()}return nil}@@ -403,27 +464,63 @@ final class GlobalHotkeyManager: NSObject {if isModifierKey, keyCode == self.rewriteModeShortcut.keyCode {if isModifierPressed {+ // Modifier pressed down+ self.modifierOnlyKeyDown = true+ self.otherKeyPressedDuringModifier = false+ self.modifierPressStartTime = Date()+if self.pressAndHoldMode {if !self.isRewriteKeyPressed {self.isRewriteKeyPressed = true- DebugLogger.shared.info("Rewrite mode modifier pressed (hold mode) - starting", source: "GlobalHotkeyManager")- self.triggerRewriteMode()+ // Delay start by 150ms to detect if this is a key combo+ self.pendingHoldModeStart?.cancel()+ self.pendingHoldModeType = .rewriteMode+ self.pendingHoldModeStart = Task { @MainActor [weak self] in+ try? await Task.sleep(nanoseconds: 150_000_000) // 150ms+ guard let self = self, !Task.isCancelled else { return }+ guard self.isRewriteKeyPressed, !self.otherKeyPressedDuringModifier else {+ DebugLogger.shared.debug("Rewrite mode hold start cancelled - key combo detected", source: "GlobalHotkeyManager")+ return+ }+ DebugLogger.shared.info("Rewrite mode modifier held (hold mode) - starting after delay", source: "GlobalHotkeyManager")+ self.triggerRewriteMode()+ }}- } else {- // Toggle mode+ }+ // Toggle mode: do NOT trigger yet, wait for release+ } else {+ // Modifier released+ let wasCleanPress = !self.otherKeyPressedDuringModifier+ self.modifierOnlyKeyDown = false+ self.otherKeyPressedDuringModifier = false+ self.modifierPressStartTime = nil++ if self.pressAndHoldMode {+ // Cancel pending start if not yet triggered+ self.pendingHoldModeStart?.cancel()+ self.pendingHoldModeStart = nil+ self.pendingHoldModeType = nil++ if self.isRewriteKeyPressed {+ self.isRewriteKeyPressed = false+ // Only stop if recording actually started+ if self.asrService.isRunning {+ DebugLogger.shared.info("Rewrite mode modifier released (hold mode) - stopping", source: "GlobalHotkeyManager")+ self.stopRecordingIfNeeded()+ }+ }+ } else if wasCleanPress {+ // Toggle mode: only trigger on release if no other key was pressedif self.asrService.isRunning {- DebugLogger.shared.info("Rewrite mode modifier pressed while recording - stopping", source: "GlobalHotkeyManager")+ DebugLogger.shared.info("Rewrite mode modifier released (toggle) - stopping", source: "GlobalHotkeyManager")self.stopRecordingIfNeeded()} else {- DebugLogger.shared.info("Rewrite mode modifier pressed - starting", source: "GlobalHotkeyManager")+ DebugLogger.shared.info("Rewrite mode modifier released (toggle) - starting", source: "GlobalHotkeyManager")self.triggerRewriteMode()}+ } else {+ DebugLogger.shared.debug("Rewrite mode modifier released but another key was pressed - ignoring", source: "GlobalHotkeyManager")}- } else if self.pressAndHoldMode, self.isRewriteKeyPressed {- // Key released in press-and-hold mode- self.isRewriteKeyPressed = false- DebugLogger.shared.info("Rewrite mode modifier released (hold mode) - stopping", source: "GlobalHotkeyManager")- self.stopRecordingIfNeeded()}return nil}@@ -433,18 +530,57 @@ final class GlobalHotkeyManager: NSObject {guard self.shortcut.modifierFlags.isEmpty else { break }if keyCode == self.shortcut.keyCode {- if self.pressAndHoldMode {- if isModifierPressed {+ if isModifierPressed {+ // Modifier pressed down+ self.modifierOnlyKeyDown = true+ self.otherKeyPressedDuringModifier = false+ self.modifierPressStartTime = Date()++ if self.pressAndHoldMode {if !self.isKeyPressed {self.isKeyPressed = true- self.startRecordingIfNeeded()+ // Delay start by 150ms to detect if this is a key combo+ self.pendingHoldModeStart?.cancel()+ self.pendingHoldModeType = .transcription+ self.pendingHoldModeStart = Task { @MainActor [weak self] in+ try? await Task.sleep(nanoseconds: 150_000_000) // 150ms+ guard let self = self, !Task.isCancelled else { return }+ guard self.isKeyPressed, !self.otherKeyPressedDuringModifier else {+ DebugLogger.shared.debug("Transcription hold start cancelled - key combo detected", source: "GlobalHotkeyManager")+ return+ }+ DebugLogger.shared.info("Transcription modifier held (hold mode) - starting after delay", source: "GlobalHotkeyManager")+ self.startRecordingIfNeeded()+ }}- } else if self.isKeyPressed {- self.isKeyPressed = false- self.stopRecordingIfNeeded()}- } else if isModifierPressed {- self.toggleRecording()+ // Toggle mode: do NOT trigger yet, wait for release+ } else {+ // Modifier released+ let wasCleanPress = !self.otherKeyPressedDuringModifier+ self.modifierOnlyKeyDown = false+ self.otherKeyPressedDuringModifier = false+ self.modifierPressStartTime = nil++ if self.pressAndHoldMode {+ // Cancel pending start if not yet triggered+ self.pendingHoldModeStart?.cancel()+ self.pendingHoldModeStart = nil+ self.pendingHoldModeType = nil++ if self.isKeyPressed {+ self.isKeyPressed = false+ // Only stop if recording actually started+ if self.asrService.isRunning {+ self.stopRecordingIfNeeded()+ }+ }+ } else if wasCleanPress {+ // Toggle mode: only trigger on release if no other key was pressed+ self.toggleRecording()+ } else {+ DebugLogger.shared.debug("Transcription modifier released but another key was pressed - ignoring", source: "GlobalHotkeyManager")+ }}return nil}diff --git a/Sources/Fluid/Views/BottomOverlayView.swift b/Sources/Fluid/Views/BottomOverlayView.swiftindex e3d9d822..a7b541d3 100644--- a/Sources/Fluid/Views/BottomOverlayView.swift+++ b/Sources/Fluid/Views/BottomOverlayView.swift@@ -364,11 +364,11 @@ struct BottomOverlayView: View {}.padding(.horizontal, 8).padding(.vertical, 6)- .background(self.theme.palette.cardBackground.opacity(0.95))+ .background(Color.black).cornerRadius(8).overlay(RoundedRectangle(cornerRadius: 8)- .stroke(self.theme.palette.cardBorder.opacity(0.45), lineWidth: 1)+ .stroke(Color.white.opacity(0.12), lineWidth: 1)).onHover { hovering inself.handlePromptHover(hovering)@@ -382,7 +382,7 @@ struct BottomOverlayView: View {if self.hasTranscription && !self.contentState.isProcessing {Text(self.transcriptionSuffix).font(.system(size: self.layout.transFontSize, weight: .medium))- .foregroundStyle(self.theme.palette.primaryText.opacity(0.9))+ .foregroundStyle(.white.opacity(0.9)).lineLimit(1).truncationMode(.head)} else if self.contentState.isProcessing {@@ -399,18 +399,18 @@ struct BottomOverlayView: View {HStack(spacing: 6) {Text("Prompt:").font(.system(size: self.layout.modeFontSize, weight: .medium))- .foregroundStyle(self.theme.palette.secondaryText.opacity(0.7))+ .foregroundStyle(.white.opacity(0.5))Text(self.selectedPromptLabel).font(.system(size: self.layout.modeFontSize, weight: .semibold))- .foregroundStyle(self.theme.palette.primaryText.opacity(0.85))+ .foregroundStyle(.white.opacity(0.75)).lineLimit(1)Image(systemName: "chevron.down").font(.system(size: max(self.layout.modeFontSize - 2, 9), weight: .semibold))- .foregroundStyle(self.theme.palette.secondaryText.opacity(0.7))+ .foregroundStyle(.white.opacity(0.45))}.padding(.horizontal, 8).padding(.vertical, 5)- .background(self.theme.palette.cardBackground.opacity(0.6))+ .background(Color.white.opacity(0.00)).cornerRadius(8).onHover { hovering inself.handlePromptHover(hovering)@@ -482,8 +482,8 @@ struct BottomOverlayView: View {.strokeBorder(LinearGradient(colors: [- self.theme.palette.cardBorder.opacity(0.6),- self.theme.palette.cardBorder.opacity(0.35),+ Color.white.opacity(0.15),+ Color.white.opacity(0.08),],startPoint: .top,endPoint: .bottomdiff --git a/Sources/Fluid/Views/NotchContentViews.swift b/Sources/Fluid/Views/NotchContentViews.swiftindex d06c2b57..b602aab6 100644--- a/Sources/Fluid/Views/NotchContentViews.swift+++ b/Sources/Fluid/Views/NotchContentViews.swift@@ -341,11 +341,10 @@ struct NotchExpandedView: View {}.padding(.horizontal, 8).padding(.vertical, 6)- .background(Color.black).cornerRadius(8).overlay(RoundedRectangle(cornerRadius: 8)- .stroke(Color.white.opacity(0.12), lineWidth: 1)+ .stroke(Color.white.opacity(0.00), lineWidth: 1)).onHover { hovering inself.handlePromptHover(hovering)@@ -399,7 +398,7 @@ struct NotchExpandedView: View {}.padding(.horizontal, 6).padding(.vertical, 4)- .background(Color.white.opacity(0.04))+ .background(Color.white.opacity(0.00)).cornerRadius(6).onHover { hovering inself.handlePromptHover(hovering)@@ -429,7 +428,7 @@ struct NotchExpandedView: View {}.padding(.horizontal, 8).padding(.vertical, 6)- .background(Color.black)+ .background(Color.black) // Must be pure black to blend with macOS notch.contentShape(Rectangle()) // Make entire area tappable.onTapGesture {// If in command mode with history, clicking expands the conversation