| commit | ab59ecebc58d1df47c4d73f5827780f57c9302c4 | [log] [tgz] |
|---|---|---|
| author | Sergey Bylokhov <serb@openjdk.org> | Thu Mar 12 10:06:55 2015 -0700 |
| committer | Sergey Bylokhov <serb@openjdk.org> | Thu Mar 12 10:06:55 2015 -0700 |
| tree | b1be8f34237d2136e38d9209df85d1ea4137e92b | |
| parent | 9e09f03258bde21cf426eeda2bf055fbe1fdbd85 [diff] |
8074668: [macosx] Mac 10.10: Application run with splash screen has focus issues Reviewed-by: prr, ant, alexsch
diff --git a/jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m b/jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m index 0eaf688..c71c636 100644 --- a/jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m +++ b/jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m
@@ -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];
diff --git a/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java b/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java index a13cd81..92de5f5 100644 --- a/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java +++ b/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java
@@ -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