OpenJDK / jdk / hs
changeset 29726:68195efbe982
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 08:57:51 -0700 |
| parents | 6962c169e541 |
| children | 34e49b091c62 |
| files | jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java |
| diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m Wed Mar 11 08:30:40 2015 -0700 +++ b/jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m Thu Mar 12 08:57:51 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/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java Wed Mar 11 08:30:40 2015 -0700 +++ b/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java Thu Mar 12 08:57:51 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