From 397457cacb9e82b9f6f41e80db894dc552c46063 Mon Sep 17 00:00:00 2001 From: lwouis Date: Fri, 4 Apr 2025 19:31:47 +0200 Subject: [PATCH] feat: clicking to focus windows/apps is now easier (closes #4407) --- src/ui/main-window/ThumbnailView.swift | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ui/main-window/ThumbnailView.swift b/src/ui/main-window/ThumbnailView.swift index 53c38101..8a322e31 100644 --- a/src/ui/main-window/ThumbnailView.swift +++ b/src/ui/main-window/ThumbnailView.swift @@ -37,6 +37,8 @@ class ThumbnailView: FlippedView { var windowControlIcons: [TrafficLightButton] { [quitIcon, closeIcon, minimizeIcon, maximizeIcon] } var windowIndicatorIcons: [ThumbnailFontIconView] { [hiddenIcon, fullscreenIcon, minimizedIcon, spaceIcon] } + var receivedMouseDown = false + // for VoiceOver cursor override var canBecomeKeyView: Bool { true } override var acceptsFirstResponder: Bool { true } @@ -71,9 +73,16 @@ class ThumbnailView: FlippedView { return open != nil } + override func mouseDown(with event: NSEvent) { + receivedMouseDown = true + } + override func mouseUp(with event: NSEvent) { - if event.clickCount >= 1 { - mouseUpCallback() + if receivedMouseDown { + if bounds.contains(convert(event.locationInWindow, from: nil)) { + mouseUpCallback() + } + receivedMouseDown = false } }