From 5ac4802e3bb5a91dfbeedc347fa2a210c6e492dc Mon Sep 17 00:00:00 2001 From: Kirill Kirichenko Date: Tue, 11 Jun 2019 14:34:16 +0300 Subject: [PATCH] Set font to Graphics in DarculaButtonUI GitOrigin-RevId: f4687ae2db958d56995604e1410e9bbfa2d03de4 --- .../ide/ui/laf/darcula/ui/DarculaButtonUI.java | 12 +++++------- .../ide/ui/laf/intellij/WinIntelliJButtonUI.java | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java index 4d9e5cb66d09..67b3e8862b66 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java @@ -260,16 +260,14 @@ public class DarculaButtonUI extends BasicButtonUI { @Override public void update(Graphics g, JComponent c) { + setupDefaultButton(c, g); super.update(g, c); - setupDefaultButton((JButton)c); } - protected void setupDefaultButton(JButton button) { - if (!SystemInfo.isMac) { - Font f = new FontUIResource(isDefaultButton(button) ? - button.getFont().deriveFont(Font.BOLD) : - button.getFont().deriveFont(Font.PLAIN)); - button.setFont(f); + protected void setupDefaultButton(JComponent button, Graphics g) { + Font f = button.getFont(); + if (!SystemInfo.isMac && f instanceof FontUIResource) { + g.setFont(isDefaultButton(button) ? f.deriveFont(Font.BOLD) : f.deriveFont(Font.PLAIN)); } } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonUI.java index eb4328e72af2..a589c0e38ed7 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonUI.java @@ -101,7 +101,7 @@ public class WinIntelliJButtonUI extends DarculaButtonUI { } @Override - protected void setupDefaultButton(JButton button) {} + protected void setupDefaultButton(JComponent button, Graphics g) {} @Override protected void paintDisabledText(Graphics g, String text, JComponent c, Rectangle textRect, FontMetrics metrics) {