changeset 6659:120f4b72ed29

8019628: [macosx] closed/java/awt/Modal/BlockedMouseInputTest/BlockedMouseInputTest.html failed since 7u40b30 on MacOS Reviewed-by: serb, leonidr
author alexsch
date Tue, 09 Jul 2013 17:15:19 +0400
parents 0020c338c0a4
children b2c2cbad0d1d
files src/macosx/classes/sun/lwawt/LWWindowPeer.java
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/macosx/classes/sun/lwawt/LWWindowPeer.java	Mon Jul 08 20:31:38 2013 +0400
+++ b/src/macosx/classes/sun/lwawt/LWWindowPeer.java	Tue Jul 09 17:15:19 2013 +0400
@@ -787,7 +787,8 @@
                     Point lp = lastMouseEventPeer.windowToLocal(x, y,
                                                                 lastWindowPeer);
                     Component target = lastMouseEventPeer.getTarget();
-                    postMouseEnteredExitedEvent(target, id, when, modifiers, lp,
+                    postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED,
+                            when, modifiers, lp,
                             screenX, screenY, clickCount, popupTrigger, button);
                 }
                 lastMouseEventPeer = null;
@@ -805,12 +806,14 @@
                         oldp.x += r.x - lr.x;
                         oldp.y += r.y - lr.y;
                         Component target = lastMouseEventPeer.getTarget();
-                        postMouseEnteredExitedEvent(target, id, when, modifiers, oldp,
+                        postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED,
+                                when, modifiers, oldp,
                                 screenX, screenY, clickCount, popupTrigger, button);
                     } else {
                         Point oldp = lastMouseEventPeer.windowToLocal(x, y, this);
                         Component target = lastMouseEventPeer.getTarget();
-                        postMouseEnteredExitedEvent(target, id, when, modifiers, oldp,
+                        postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_EXITED,
+                                when, modifiers, oldp,
                                 screenX, screenY, clickCount, popupTrigger, button);
                     }
                 }
@@ -818,7 +821,8 @@
                 if (targetPeer != null && targetPeer.isEnabled() && id != MouseEvent.MOUSE_ENTERED) {
                     Point newp = targetPeer.windowToLocal(x, y, curWindowPeer);
                     Component target = targetPeer.getTarget();
-                    postMouseEnteredExitedEvent(target, id, when, modifiers, newp,
+                    postMouseEnteredExitedEvent(target, MouseEvent.MOUSE_ENTERED,
+                            when, modifiers, newp,
                             screenX, screenY, clickCount, popupTrigger, button);
                 }
             }