Skip to content

[JEWEL-1276] Fix popup focus-stealing in JDialogRenderer #3476

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

Open
rock3r wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Open

[JEWEL-1276] Fix popup focus-stealing in JDialogRenderer #3476

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
10 changes: 8 additions & 2 deletions ...-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/popup/JDialogRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ private fun JPopupImpl(
}
}
is AWTKeyEvent -> {
if (!dialog.isActive) return@AWTEventListener
if (!dialog.isVisible) return@AWTEventListener

val composeEvent = event.toComposeKeyEvent()

Expand All @@ -344,9 +344,15 @@ private fun JPopupImpl(
DisposableEffect(dialog) {
dialog.contentPane = composePanel

dialog.isAutoRequestFocus = currentProperties.focusable
// JEWEL-1276 this weird code duplicates the JBPopup/AbstractPopup logic to avoid focus stealing on macOS.
// The actual hack is implemented in LocalPopupComponentFactory and uses the fact that macOS only sets the
// "key window" when a new window/popup is created. We don't want our popups to do it by default, so we
// start them as non-focusable, and then make them focusable a short while later.
dialog.focusableWindowState = false
dialog.isAutoRequestFocus = false
dialog.isVisible = true
dialog.size = composePanel.preferredSize
SwingUtilities.invokeLater { dialog.focusableWindowState = true }

onDispose {
dialog.isVisible = false
Expand Down
Loading