changeset 7978:84163d4b66f0 jdk7u76-b07

Merge
author asaha
date Mon, 03 Nov 2014 12:22:27 -0800
parents 535df8cdec4a ab38de897d40
children 3ffaec4e32f2
files .hgtags src/macosx/native/sun/awt/AWTWindow.m
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jul 23 20:14:02 2014 +0100
+++ b/.hgtags	Mon Nov 03 12:22:27 2014 -0800
@@ -518,6 +518,7 @@
 1964c973dcc1ddb30115b7c7b6183548b3adcdf5 jdk7u75-b04
 ec3e1e179298a41bc6b77a170e2da66efb0bae3b jdk7u75-b05
 e9596c6470c944ff19c5198cfeb7fd979aad9120 jdk7u75-b06
+e0afb6ec0633d18f360f074c5672fa4c2196ea39 jdk7u75-b07
 0666a58a7e584380c1b1dadb50ec67400110a9ab jdk7u76-b00
 182b3e8a732d6b0d21bd7d602361e5276f14b886 jdk7u76-b01
 3c743031578a431ccc1e27691b1958355d02caec jdk7u76-b02
--- a/src/macosx/native/sun/awt/AWTWindow.m	Wed Jul 23 20:14:02 2014 +0100
+++ b/src/macosx/native/sun/awt/AWTWindow.m	Mon Nov 03 12:22:27 2014 -0800
@@ -320,7 +320,8 @@
 
 // return id for the topmost window under mouse
 + (NSInteger) getTopmostWindowUnderMouseID {
-
+    NSInteger result = -1;
+    
     NSRect screenRect = [[NSScreen mainScreen] frame];
     NSPoint nsMouseLocation = [NSEvent mouseLocation];
     CGPoint cgMouseLocation = CGPointMake(nsMouseLocation.x, screenRect.size.height - nsMouseLocation.y);
@@ -334,11 +335,13 @@
             CGRect rect;
             CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[window objectForKey:(id)kCGWindowBounds], &rect);
             if (CGRectContainsPoint(rect, cgMouseLocation)) {
-                return [[window objectForKey:(id)kCGWindowNumber] integerValue];
+                result = [[window objectForKey:(id)kCGWindowNumber] integerValue];
+                break;
             }
         }
     }
-    return -1;
+    [windows release];
+    return result;
 }
 
 // checks that this window is under the mouse cursor and this point is not overlapped by other windows