From fbc75d85589d96a9c3157a0f62449f785c451fba Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 31 May 2016 14:57:44 +0200 Subject: [PATCH] win10: remove bold from default buttons --- .../ide/ui/laf/darcula/ui/DarculaButtonUI.java | 14 ++++++++++---- .../ide/ui/laf/intellij/WinIntelliJButtonUI.java | 5 +++++ 2 files changed, 15 insertions(+), 4 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 5abe61cefbda..a4c18667b0cb 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 @@ -162,13 +162,19 @@ public class DarculaButtonUI extends BasicButtonUI { @Override public void update(Graphics g, JComponent c) { super.update(g, c); - if (isDefaultButton(c) && !SystemInfo.isMac) { - if (!c.getFont().isBold()) { - c.setFont(new FontUIResource(c.getFont().deriveFont(Font.BOLD))); + if (isDefaultButton(c)) { + setupDefaultButton((JButton)c); + } + } + + protected void setupDefaultButton(JButton button) { + if (!SystemInfo.isMac) { + if (!button.getFont().isBold()) { + button.setFont(new FontUIResource(button.getFont().deriveFont(Font.BOLD))); } } } - + public static boolean isHelpButton(JComponent button) { return (SystemInfo.isMac || (SystemInfo.isWindows && Registry.is("ide.intellij.laf.win10.ui"))) && button instanceof JButton 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 98d2718ee8d9..7ac4613cc805 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 @@ -74,6 +74,11 @@ public class WinIntelliJButtonUI extends DarculaButtonUI { return true; } + @Override + protected void setupDefaultButton(JButton button) { + //do nothing + } + @Override protected void paintDisabledText(Graphics g, String text, JComponent c, Rectangle textRect, FontMetrics metrics) { g.setColor(UIManager.getColor("Button.disabledText"));