From b463dbbe752e5ea13a364e79de44259fa9c99b95 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Thu, 21 May 2015 15:36:41 +0300 Subject: [PATCH] IDEA-140577 NPE in splash screen --- .../platform-impl/src/com/intellij/ui/Splash.java | 2 +- platform/util/src/com/intellij/util/ui/UIUtil.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ui/Splash.java b/platform/platform-impl/src/com/intellij/ui/Splash.java index 069afd58c802..3ec520029f93 100644 --- a/platform/platform-impl/src/com/intellij/ui/Splash.java +++ b/platform/platform-impl/src/com/intellij/ui/Splash.java @@ -166,7 +166,7 @@ public class Splash extends JDialog implements StartupProgress { if (ApplicationInfoImpl.getShadowInstance().showLicenseeInfo()) { final LicensingFacade provider = LicensingFacade.getInstance(); if (provider != null) { - UISettings.setupAntialiasing(g); + UIUtil.applyRenderingHints(g); g.setFont(new Font(UIUtil.ARIAL_FONT_NAME, Font.BOLD, JBUI.scale(SystemInfo.isUnix ? 10 : 11))); g.setColor(textColor); diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java index e6b3712eb2bb..a60bd9101473 100644 --- a/platform/util/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/src/com/intellij/util/ui/UIUtil.java @@ -1761,6 +1761,20 @@ public class UIUtil { return image; } + /** This method is intended to use when user settings are not accessible yet. + * Use it to set up default RenderingHints. + * @param g + */ + public static void applyRenderingHints(final Graphics g) { + Graphics2D g2d = (Graphics2D)g; + Toolkit tk = Toolkit.getDefaultToolkit(); + //noinspection HardCodedStringLiteral + Map map = (Map)tk.getDesktopProperty("awt.font.desktophints"); + if (map != null) { + g2d.addRenderingHints(map); + } + } + public static BufferedImage createImage(int width, int height, int type) { if (isRetina()) { return RetinaImage.create(width, height, type);