Mercurial > hg > openjdk > icedtea > jdk7 > jdk

changeset 5415:19fb8a44120c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7147055: [macosx] Cursors are changing over a blocked window; also blinking Reviewed-by: anthony, leonidr
author serb
date Wed, 20 Jun 2012 16:54:23 +0400
parents cd10e1413a76
children 7fdc1af4bf3f dce05a523e0e
files src/macosx/classes/sun/lwawt/LWCursorManager.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/macosx/classes/sun/lwawt/LWCursorManager.java	Thu Jun 07 15:28:38 2012 +0200
+++ b/src/macosx/classes/sun/lwawt/LWCursorManager.java	Wed Jun 20 16:54:23 2012 +0400
@@ -88,20 +88,20 @@
         } else {
             cursor = (c != null) ? c.getCursor() : null;
         }
-        // TODO: default cursor for modal blocked windows
         setCursor(cursor);
     }
 
     /**
      * Returns the first visible, enabled and showing component under cursor.
+     * Returns null for modal blocked windows.
      *
      * @param cursorPos Current cursor position.
-     * @return Component
+     * @return Component or null.
      */
     private static final Component findComponent(final Point cursorPos) {
         final LWComponentPeer<?, ?> peer = LWWindowPeer.getPeerUnderCursor();
         Component c = null;
-        if (peer != null) {
+        if (peer != null && peer.getWindowPeerOrSelf().getBlocker() == null) {
             c = peer.getTarget();
             if (c instanceof Container) {
                 final Point p = peer.getLocationOnScreen();