From 26e644e5d44106ebdf072e2046582d6637b73b46 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Thu, 9 Sep 2021 10:15:26 +0300 Subject: [PATCH] JBR-3504 a11y focus is set on the wrong element when opening popups (cherry-picked from commit a69e12e0d2fd2700bae7796e69d8787eee0a2121) (cherry picked from commit e06081f5ab14419647acf4904f84f463d78e0199) --- .../macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java index 2148ed64332a..ec0aee32f5dd 100644 --- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java +++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java @@ -416,7 +416,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo protected int getInitialStyleBits() { // defaults style bits - int styleBits = DECORATED | HAS_SHADOW | CLOSEABLE | MINIMIZABLE | ZOOMABLE | RESIZABLE | TITLE_VISIBLE; + int styleBits = DECORATED | HAS_SHADOW | CLOSEABLE | ZOOMABLE | RESIZABLE | TITLE_VISIBLE; if (isNativelyFocusableWindow()) { styleBits = SET(styleBits, SHOULD_BECOME_KEY, true); @@ -426,8 +426,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo final boolean isFrame = (target instanceof Frame); final boolean isDialog = (target instanceof Dialog); final boolean isPopup = (target.getType() == Window.Type.POPUP); - if (isDialog) { - styleBits = SET(styleBits, MINIMIZABLE, false); + if (isFrame) { + styleBits = SET(styleBits, MINIMIZABLE, true); } // Either java.awt.Frame or java.awt.Dialog can be undecorated, however java.awt.Window always is undecorated.