From 3553a7da6dbe3eb88dc4982ba0b1ce3ecaeb1eb9 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 10 Oct 2016 11:38:03 +0200 Subject: [PATCH] fix Darcula help button --- .../com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 a4c18667b0cb..a7b8e7957eb7 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 @@ -19,7 +19,6 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.ui.laf.darcula.DarculaLaf; import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.openapi.util.SystemInfo; -import com.intellij.openapi.util.registry.Registry; import com.intellij.util.ObjectUtils; import com.intellij.util.ui.GraphicsUtil; import com.intellij.util.ui.JBUI; @@ -176,7 +175,7 @@ public class DarculaButtonUI extends BasicButtonUI { } public static boolean isHelpButton(JComponent button) { - return (SystemInfo.isMac || (SystemInfo.isWindows && Registry.is("ide.intellij.laf.win10.ui"))) + return (SystemInfo.isMac || UIUtil.isUnderDarcula() || UIUtil.isUnderWin10LookAndFeel()) && button instanceof JButton && "help".equals(button.getClientProperty("JButton.buttonType")); }