Skip to content

fix(macos): ignore leftover Finder click after TrayApp show #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kdroidFilter merged 1 commit into from
Aug 28, 2026
Merged

fix(macos): ignore leftover Finder click after TrayApp show #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ kotlinx-coroutines = "1.11.0"
compose = "1.12.0"
detekt = "1.23.8"
ktlint = "12.1.2"
nucleus = "2.5.0"
nucleus-plugin = "2.5.0"
nucleus = "2.5.5"

[libraries]
kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
Expand All @@ -26,4 +25,4 @@ vannitktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.
dokka = { id = "org.jetbrains.dokka", version = "2.2.0" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
nucleus = { id = "dev.nucleusframework", version.ref = "nucleus-plugin" }
nucleus = { id = "dev.nucleusframework", version.ref = "nucleus" }
21 changes: 17 additions & 4 deletions tray-app/src/jvmMain/kotlin/dev/nucleusframework/composenativetray/trayapp/TrayApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,12 +614,18 @@ private fun TrayAppImplPanel(
instanceKey, widthPx, heightPx, horizontalOffset, verticalOffset,
)
}
// Stamp before show(): a leftover Finder mouseDown on the desktop
// (same gesture that opened the tray) can land in onOutsideClick
// before the panel is on screen. lastShownAtMs starts at 0, which
// would make minVisibleDurationMs a no-op and hide immediately.
lastShownAtMs.set(now)
trayAppState.show()
}
}

LaunchedEffect(isVisible) {
if (isVisible) {
lastShownAtMs.set(System.currentTimeMillis())
if (!popupOnScreen) {
val preComputed = pendingPosition
pendingPosition = null
Expand Down Expand Up @@ -712,11 +718,18 @@ private fun TrayAppImplPanel(
size = currentWindowSize,
focusable = true,
onOutsideClick = {
// The monitor is process-wide: ignore clicks while already hidden.
// Process-wide monitor: ignore while hidden, and drop leftover
// Finder desktop clicks from the same gesture that opened us.
// Delaying those hides (minVisibleDurationMs) would flash-close.
if (trayAppState.isVisible.value) {
lastDismissAtMs.set(System.currentTimeMillis())
debugln { "[TrayApp] outside click dismiss, dismissMode=$dismissMode" }
if (dismissMode == TrayWindowDismissMode.AUTO) requestHideExplicit()
val sinceShow = System.currentTimeMillis() - lastShownAtMs.get()
if (sinceShow < minVisibleDurationMs) {
debugln { "[TrayApp] outside click ignored (${sinceShow}ms after show)" }
} else {
lastDismissAtMs.set(System.currentTimeMillis())
debugln { "[TrayApp] outside click dismiss, dismissMode=$dismissMode" }
if (dismissMode == TrayWindowDismissMode.AUTO) requestHideExplicit()
}
}
},
onPreviewKeyEvent = onPreviewKeyEvent,
Expand Down
Loading