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 flickers on rendering with prompt selection
grohith32796a67ac19504
diff --git a/Sources/Fluid/Views/BottomOverlayView.swift b/Sources/Fluid/Views/BottomOverlayView.swiftindex 8a423c26..baea3432 100644--- a/Sources/Fluid/Views/BottomOverlayView.swift+++ b/Sources/Fluid/Views/BottomOverlayView.swift@@ -35,6 +35,7 @@ final class BottomOverlayWindowController {func show(audioPublisher: AnyPublisher<CGFloat, Never>, mode: OverlayMode) {self.pendingResizeWorkItem?.cancel()self.pendingResizeWorkItem = nil+ BottomOverlayPromptMenuController.shared.hide()// Update mode in content stateNotchContentState.shared.mode = mode@@ -74,6 +75,7 @@ final class BottomOverlayWindowController {self.audioSubscription = nilself.pendingResizeWorkItem?.cancel()self.pendingResizeWorkItem = nil+ BottomOverlayPromptMenuController.shared.hide()// Reset stateNotchContentState.shared.setProcessing(false)@@ -199,6 +201,420 @@ final class BottomOverlayWindowController {}}+@MainActor+final class BottomOverlayPromptMenuController {+ static let shared = BottomOverlayPromptMenuController()++ private var menuWindow: NSPanel?+ private var hostingView: NSHostingView<BottomOverlayPromptMenuView>?+ private var selectorFrameInScreen: CGRect = .zero+ private weak var parentWindow: NSWindow?+ private var menuMaxWidth: CGFloat = 220+ private var menuGap: CGFloat = 6++ private var isHoveringSelector = false+ private var isHoveringMenu = false+ private var pendingShowWorkItem: DispatchWorkItem?+ private var pendingHideWorkItem: DispatchWorkItem?+ private var pendingPositionWorkItem: DispatchWorkItem?++ private init() {}++ func updateAnchor(selectorFrameInScreen: CGRect, parentWindow: NSWindow?, maxWidth: CGFloat, menuGap: CGFloat) {+ guard selectorFrameInScreen.width > 0, selectorFrameInScreen.height > 0 else { return }++ let resolvedMaxWidth = max(maxWidth, 120)+ let widthChanged = abs(self.menuMaxWidth - resolvedMaxWidth) > 0.5++ self.selectorFrameInScreen = selectorFrameInScreen+ self.parentWindow = parentWindow+ self.menuMaxWidth = resolvedMaxWidth+ self.menuGap = max(menuGap, 2)++ if self.menuWindow?.isVisible == true {+ if widthChanged {+ self.updateMenuContent()+ }+ self.attachToParentWindowIfNeeded()+ self.scheduleMenuPositionUpdate()+ }+ }++ func selectorHoverChanged(_ hovering: Bool) {+ self.isHoveringSelector = hovering+ self.updateVisibility()+ }++ func menuHoverChanged(_ hovering: Bool) {+ self.isHoveringMenu = hovering+ self.updateVisibility()+ }++ func hide() {+ self.pendingShowWorkItem?.cancel()+ self.pendingShowWorkItem = nil+ self.pendingHideWorkItem?.cancel()+ self.pendingHideWorkItem = nil+ self.pendingPositionWorkItem?.cancel()+ self.pendingPositionWorkItem = nil++ self.isHoveringSelector = false+ self.isHoveringMenu = false++ if let menuWindow = self.menuWindow, let parent = menuWindow.parent {+ parent.removeChildWindow(menuWindow)+ }+ self.menuWindow?.orderOut(nil)+ }++ private func updateVisibility() {+ let shouldShow = self.isHoveringSelector || self.isHoveringMenu++ if shouldShow {+ self.pendingHideWorkItem?.cancel()+ self.pendingHideWorkItem = nil++ if self.menuWindow?.isVisible == true {+ self.scheduleMenuPositionUpdate()+ return+ }++ self.pendingShowWorkItem?.cancel()+ let showTask = DispatchWorkItem { [weak self] in+ self?.showMenuIfPossible()+ }+ self.pendingShowWorkItem = showTask+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.04, execute: showTask)+ return+ }++ self.pendingShowWorkItem?.cancel()+ self.pendingShowWorkItem = nil++ self.pendingHideWorkItem?.cancel()+ let hideTask = DispatchWorkItem { [weak self] in+ self?.hideIfNotHovered()+ }+ self.pendingHideWorkItem = hideTask+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.16, execute: hideTask)+ }++ private func hideIfNotHovered() {+ guard !self.isHoveringSelector, !self.isHoveringMenu else { return }+ self.pendingPositionWorkItem?.cancel()+ self.pendingPositionWorkItem = nil+ if let menuWindow = self.menuWindow, let parent = menuWindow.parent {+ parent.removeChildWindow(menuWindow)+ }+ self.menuWindow?.orderOut(nil)+ }++ private func scheduleMenuPositionUpdate() {+ guard self.pendingPositionWorkItem == nil else { return }++ let task = DispatchWorkItem { [weak self] in+ guard let self else { return }+ self.pendingPositionWorkItem = nil+ self.updateMenuSizeAndPosition()+ }++ self.pendingPositionWorkItem = task+ DispatchQueue.main.async(execute: task)+ }++ private func showMenuIfPossible() {+ guard self.selectorFrameInScreen.width > 0, self.selectorFrameInScreen.height > 0 else { return }++ self.createWindowIfNeeded()+ self.updateMenuContent()+ self.attachToParentWindowIfNeeded()+ self.updateMenuSizeAndPosition()+ self.menuWindow?.orderFrontRegardless()+ }++ private func createWindowIfNeeded() {+ guard self.menuWindow == nil else { return }++ let panel = NSPanel(+ contentRect: .zero,+ styleMask: [.borderless, .nonactivatingPanel],+ backing: .buffered,+ defer: false+ )++ panel.isFloatingPanel = true+ panel.level = .floating+ panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]+ panel.isOpaque = false+ panel.backgroundColor = .clear+ panel.hasShadow = false+ panel.isMovableByWindowBackground = false+ panel.hidesOnDeactivate = false+ panel.animationBehavior = .none++ let contentView = BottomOverlayPromptMenuView(+ maxWidth: self.menuMaxWidth,+ onHoverChanged: { [weak self] hovering in+ self?.menuHoverChanged(hovering)+ },+ onDismissRequested: { [weak self] in+ self?.hide()+ }+ )++ let hostingView = NSHostingView(rootView: contentView)+ let fittingSize = hostingView.fittingSize+ hostingView.frame = NSRect(origin: .zero, size: fittingSize)+ hostingView.wantsLayer = true+ hostingView.layer?.backgroundColor = .clear++ panel.setContentSize(fittingSize)+ panel.contentView = hostingView++ self.hostingView = hostingView+ self.menuWindow = panel+ }++ private func updateMenuContent() {+ let rootView = BottomOverlayPromptMenuView(+ maxWidth: self.menuMaxWidth,+ onHoverChanged: { [weak self] hovering in+ self?.menuHoverChanged(hovering)+ },+ onDismissRequested: { [weak self] in+ self?.hide()+ }+ )+ self.hostingView?.rootView = rootView+ }++ private func attachToParentWindowIfNeeded() {+ guard let menuWindow = self.menuWindow else { return }++ if let currentParent = menuWindow.parent, currentParent !== self.parentWindow {+ currentParent.removeChildWindow(menuWindow)+ }++ if let parentWindow = self.parentWindow, menuWindow.parent !== parentWindow {+ parentWindow.addChildWindow(menuWindow, ordered: .above)+ }+ }++ private func updateMenuSizeAndPosition() {+ guard let menuWindow = self.menuWindow, let hostingView = self.hostingView else { return }+ guard self.selectorFrameInScreen.width > 0, self.selectorFrameInScreen.height > 0 else { return }++ let fittingSize = hostingView.fittingSize+ guard fittingSize.width > 0, fittingSize.height > 0 else { return }++ let preferredX = self.selectorFrameInScreen.midX - (fittingSize.width / 2)+ let preferredY = self.selectorFrameInScreen.minY - self.menuGap - fittingSize.height++ let screen = self.parentWindow?.screen+ ?? NSScreen.screens.first(where: { $0.frame.contains(NSPoint(x: self.selectorFrameInScreen.midX, y: self.selectorFrameInScreen.midY)) })+ ?? NSScreen.main++ var targetX = preferredX+ var targetY = preferredY++ if let screen {+ let visible = screen.visibleFrame+ let horizontalInset: CGFloat = 8+ let verticalInset: CGFloat = 8++ if fittingSize.width < visible.width - (horizontalInset * 2) {+ targetX = max(visible.minX + horizontalInset, min(preferredX, visible.maxX - fittingSize.width - horizontalInset))+ } else {+ targetX = visible.minX + horizontalInset+ }++ if fittingSize.height < visible.height - (verticalInset * 2) {+ targetY = max(visible.minY + verticalInset, min(preferredY, visible.maxY - fittingSize.height - verticalInset))+ } else {+ targetY = visible.minY + verticalInset+ }+ }++ let targetFrame = NSRect(x: targetX, y: targetY, width: fittingSize.width, height: fittingSize.height)+ let currentFrame = menuWindow.frame+ let frameTolerance: CGFloat = 0.5+ let isSameFrame =+ abs(currentFrame.origin.x - targetFrame.origin.x) <= frameTolerance &&+ abs(currentFrame.origin.y - targetFrame.origin.y) <= frameTolerance &&+ abs(currentFrame.size.width - targetFrame.size.width) <= frameTolerance &&+ abs(currentFrame.size.height - targetFrame.size.height) <= frameTolerance++ if !isSameFrame {+ menuWindow.setFrame(targetFrame, display: false)+ }+ }+}++private struct BottomOverlayPromptMenuView: View {+ @ObservedObject private var settings = SettingsStore.shared++ let maxWidth: CGFloat+ let onHoverChanged: (Bool) -> Void+ let onDismissRequested: () -> Void++ var body: some View {+ VStack(alignment: .leading, spacing: 0) {+ Button(action: {+ self.settings.selectedDictationPromptID = nil+ self.restoreTypingTargetApp()+ self.onDismissRequested()+ }) {+ HStack {+ Text("Default")+ Spacer()+ if self.settings.selectedDictationPromptID == nil {+ Image(systemName: "checkmark")+ .font(.system(size: 10, weight: .semibold))+ }+ }+ }+ .buttonStyle(.plain)+ .padding(.vertical, 4)++ if !self.settings.dictationPromptProfiles.isEmpty {+ Divider()+ .padding(.vertical, 4)++ ForEach(self.settings.dictationPromptProfiles) { profile in+ Button(action: {+ self.settings.selectedDictationPromptID = profile.id+ self.restoreTypingTargetApp()+ self.onDismissRequested()+ }) {+ HStack {+ Text(profile.name.isEmpty ? "Untitled" : profile.name)+ Spacer()+ if self.settings.selectedDictationPromptID == profile.id {+ Image(systemName: "checkmark")+ .font(.system(size: 10, weight: .semibold))+ }+ }+ }+ .buttonStyle(.plain)+ .padding(.vertical, 4)+ }+ }+ }+ .padding(.horizontal, 8)+ .padding(.vertical, 6)+ .background(Color.black)+ .cornerRadius(8)+ .overlay(+ RoundedRectangle(cornerRadius: 8)+ .stroke(Color.white.opacity(0.12), lineWidth: 1)+ )+ .frame(maxWidth: self.maxWidth)+ .onHover { hovering in+ self.onHoverChanged(hovering)+ }+ }++ private func restoreTypingTargetApp() {+ let pid = NotchContentState.shared.recordingTargetPID+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {+ if let pid { _ = TypingService.activateApp(pid: pid) }+ }+ }+}++private struct PromptSelectorAnchorReader: NSViewRepresentable {+ let onFrameChange: (CGRect, NSWindow?) -> Void++ func makeNSView(context: Context) -> AnchorReportingView {+ let view = AnchorReportingView()+ view.onFrameChange = self.onFrameChange+ return view+ }++ func updateNSView(_ nsView: AnchorReportingView, context: Context) {+ nsView.onFrameChange = self.onFrameChange+ }++ final class AnchorReportingView: NSView {+ var onFrameChange: ((CGRect, NSWindow?) -> Void)?+ private var windowObservers: [NSObjectProtocol] = []+ private var lastReportedFrameInScreen: CGRect = .null+ private weak var lastReportedWindow: NSWindow?++ override func viewDidMoveToWindow() {+ super.viewDidMoveToWindow()+ self.installWindowObservers()+ self.reportFrame(force: true)+ }++ override func layout() {+ super.layout()+ self.reportFrame()+ }++ deinit {+ self.cleanup()+ }++ func cleanup() {+ for observer in self.windowObservers {+ NotificationCenter.default.removeObserver(observer)+ }+ self.windowObservers.removeAll()+ }++ private func installWindowObservers() {+ self.cleanup()+ guard let window = self.window else { return }++ let center = NotificationCenter.default+ self.windowObservers.append(+ center.addObserver(forName: NSWindow.didMoveNotification, object: window, queue: .main) { [weak self] _ in+ self?.reportFrame()+ }+ )+ self.windowObservers.append(+ center.addObserver(forName: NSWindow.didResizeNotification, object: window, queue: .main) { [weak self] _ in+ self?.reportFrame()+ }+ )+ self.windowObservers.append(+ center.addObserver(forName: NSWindow.didChangeScreenNotification, object: window, queue: .main) { [weak self] _ in+ self?.reportFrame()+ }+ )+ }++ func reportFrame(force: Bool = false) {+ guard let window = self.window else {+ if force || !self.lastReportedFrameInScreen.isNull {+ self.lastReportedFrameInScreen = .null+ self.lastReportedWindow = nil+ self.onFrameChange?(CGRect.zero, nil)+ }+ return+ }++ let frameInWindow = self.convert(self.bounds, to: nil)+ let frameInScreen = window.convertToScreen(frameInWindow)+ let frameTolerance: CGFloat = 0.5+ let hasLastFrame = !self.lastReportedFrameInScreen.isNull+ let frameChanged = !hasLastFrame ||+ abs(frameInScreen.origin.x - self.lastReportedFrameInScreen.origin.x) > frameTolerance ||+ abs(frameInScreen.origin.y - self.lastReportedFrameInScreen.origin.y) > frameTolerance ||+ abs(frameInScreen.size.width - self.lastReportedFrameInScreen.size.width) > frameTolerance ||+ abs(frameInScreen.size.height - self.lastReportedFrameInScreen.size.height) > frameTolerance+ let windowChanged = self.lastReportedWindow !== window++ guard force || frameChanged || windowChanged else { return }++ self.lastReportedFrameInScreen = frameInScreen+ self.lastReportedWindow = window+ self.onFrameChange?(frameInScreen, window)+ }+ }+}+// MARK: - Bottom Overlay SwiftUI Viewstruct BottomOverlayView: View {@@ -206,10 +622,6 @@ struct BottomOverlayView: View {@ObservedObject private var appServices = AppServices.shared@ObservedObject private var settings = SettingsStore.shared@Environment(\.theme) private var theme- @State private var showPromptHoverMenu = false- @State private var isHoveringPromptSelector = false- @State private var isHoveringPromptMenu = false- @State private var promptHoverWorkItem: DispatchWorkItem?struct LayoutConstants {let hPadding: CGFloat@@ -341,10 +753,6 @@ struct BottomOverlayView: View {max(4, self.layout.vPadding * 0.35)}- private var promptSelectorHeight: CGFloat {- self.promptSelectorFontSize + (self.promptSelectorVerticalPadding * 2) + 4- }-private var promptSelectorCornerRadius: CGFloat {max(self.layout.cornerRadius * 0.42, 8)}@@ -369,38 +777,30 @@ struct BottomOverlayView: View {self.contentState.cachedPreviewText}- private func setPromptMenuVisible(_ visible: Bool) {- guard self.showPromptHoverMenu != visible else { return }- self.showPromptHoverMenu = visible- }-private func closePromptMenu() {- self.promptHoverWorkItem?.cancel()- self.promptHoverWorkItem = nil- self.isHoveringPromptSelector = false- self.isHoveringPromptMenu = false- self.setPromptMenuVisible(false)+ BottomOverlayPromptMenuController.shared.hide()}- private func updatePromptMenuForHoverState() {- self.promptHoverWorkItem?.cancel()-- let shouldShow = self.isHoveringPromptSelector || self.isHoveringPromptMenu- let task = DispatchWorkItem {- self.setPromptMenuVisible(shouldShow)+ private func handlePromptSelectorHover(_ hovering: Bool) {+ guard self.isDictationMode, !self.contentState.isProcessing else {+ BottomOverlayPromptMenuController.shared.hide()+ return}- self.promptHoverWorkItem = task- DispatchQueue.main.asyncAfter(deadline: .now() + (shouldShow ? 0.04 : 0.16), execute: task)+ BottomOverlayPromptMenuController.shared.selectorHoverChanged(hovering)}- private func handlePromptSelectorHover(_ hovering: Bool) {- self.isHoveringPromptSelector = hovering- self.updatePromptMenuForHoverState()- }+ private func handlePromptSelectorFrameChange(_ frameInScreen: CGRect, window: NSWindow?) {+ guard self.isDictationMode, !self.contentState.isProcessing else {+ BottomOverlayPromptMenuController.shared.hide()+ return+ }- private func handlePromptMenuHover(_ hovering: Bool) {- self.isHoveringPromptMenu = hovering- self.updatePromptMenuForHoverState()+ BottomOverlayPromptMenuController.shared.updateAnchor(+ selectorFrameInScreen: frameInScreen,+ parentWindow: window,+ maxWidth: self.promptSelectorMaxWidth,+ menuGap: self.promptMenuGap+ )}private var promptSelectorTrigger: some View {@@ -439,84 +839,18 @@ struct BottomOverlayView: View {}private var promptSelectorView: some View {- ZStack(alignment: .bottom) {- if self.showPromptHoverMenu {- self.promptMenuContent()- .padding(.bottom, self.promptSelectorHeight + self.promptMenuGap)- .zIndex(10)- }-- self.promptSelectorTrigger- .zIndex(20)- }- .frame(maxWidth: self.promptSelectorMaxWidth, alignment: .bottom)- .contentShape(Rectangle())- .onHover { hovering in- self.handlePromptSelectorHover(hovering)- }- }-- private func promptMenuContent() -> some View {- VStack(alignment: .leading, spacing: 0) {- Button(action: {- self.settings.selectedDictationPromptID = nil- let pid = NotchContentState.shared.recordingTargetPID- DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {- if let pid { _ = TypingService.activateApp(pid: pid) }- }- self.closePromptMenu()- }) {- HStack {- Text("Default")- Spacer()- if self.settings.selectedDictationPromptID == nil {- Image(systemName: "checkmark")- .font(.system(size: 10, weight: .semibold))- }- }- }- .buttonStyle(.plain)- .padding(.vertical, 4)-- if !self.settings.dictationPromptProfiles.isEmpty {- Divider()- .padding(.vertical, 4)-- ForEach(self.settings.dictationPromptProfiles) { profile in- Button(action: {- self.settings.selectedDictationPromptID = profile.id- let pid = NotchContentState.shared.recordingTargetPID- DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {- if let pid { _ = TypingService.activateApp(pid: pid) }- }- self.closePromptMenu()- }) {- HStack {- Text(profile.name.isEmpty ? "Untitled" : profile.name)- Spacer()- if self.settings.selectedDictationPromptID == profile.id {- Image(systemName: "checkmark")- .font(.system(size: 10, weight: .semibold))- }- }- }- .buttonStyle(.plain)- .padding(.vertical, 4)+ self.promptSelectorTrigger+ .background(+ PromptSelectorAnchorReader { frameInScreen, window in+ self.handlePromptSelectorFrameChange(frameInScreen, window: window)}+ .allowsHitTesting(false)+ )+ .frame(maxWidth: self.promptSelectorMaxWidth, alignment: .center)+ .contentShape(Rectangle())+ .onHover { hovering in+ self.handlePromptSelectorHover(hovering)}- }- .padding(.horizontal, 8)- .padding(.vertical, 6)- .background(Color.black)- .cornerRadius(8)- .overlay(- RoundedRectangle(cornerRadius: 8)- .stroke(Color.white.opacity(0.12), lineWidth: 1)- )- .frame(maxWidth: self.promptSelectorMaxWidth)- .onHover { hovering in- self.handlePromptMenuHover(hovering)- }}var body: some View {@@ -640,9 +974,6 @@ struct BottomOverlayView: View {.onChange(of: self.contentState.cachedPreviewText) { _, _ inBottomOverlayWindowController.shared.refreshSizeForContent()}- .onChange(of: self.showPromptHoverMenu) { _, _ in- BottomOverlayWindowController.shared.refreshSizeForContent()- }.onChange(of: self.contentState.mode) { _, _ inif !self.isDictationMode || self.contentState.isProcessing {self.closePromptMenu()@@ -656,11 +987,7 @@ struct BottomOverlayView: View {BottomOverlayWindowController.shared.refreshSizeForContent()}.onDisappear {- self.promptHoverWorkItem?.cancel()- self.promptHoverWorkItem = nil- self.isHoveringPromptSelector = false- self.isHoveringPromptMenu = false- self.showPromptHoverMenu = false+ self.closePromptMenu()}// TODO: Add tap-to-expand for command mode history (future enhancement)// .contentShape(Rectangle())