Mercurial > hg > openjdk > jdk8u > jdk
changeset 10662:d4453d784fb6 jdk8u40-b27
8074668: [macosx] Mac 10.10: Application run with splash screen has focus issues
Reviewed-by: prr, ant, alexsch
author | serb |
---|---|
date | Thu, 12 Mar 2015 10:06:55 -0700 |
parents | fb21543dce39 |
children | c7bbaa04eaa8 |
files | src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java |
diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m Sat Mar 07 10:26:47 2015 -0800 +++ b/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m Thu Mar 12 10:06:55 2015 -0700 @@ -131,11 +131,7 @@ NSAutoreleasePool *pool = [NSAutoreleasePool new]; *scaleFactor = 1; char* scaledFile = nil; - __block float screenScaleFactor = 1; - - [ThreadUtilities performOnMainThreadWaiting:YES block:^(){ - screenScaleFactor = [SplashNSScreen() backingScaleFactor]; - }]; + float screenScaleFactor = 1; if (screenScaleFactor > 1) { NSString *fileName = [NSString stringWithUTF8String: file];
--- a/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java Sat Mar 07 10:26:47 2015 -0800 +++ b/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java Thu Mar 12 10:06:55 2015 -0700 @@ -36,7 +36,7 @@ import sun.java2d.SunGraphics2D; /** - * @test + * test * @bug 8043869 * @author Alexander Scherbatiy * @summary [macosx] java -splash does not honor 2x hi dpi notation for retina