From 81015c03b5f8518e7b6bba54f2c3d7ca608202c2 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Thu, 13 Sep 2012 13:12:19 +0400 Subject: [PATCH] fix helps button for Darcula --- .../src/com/intellij/ide/wizard/AbstractWizard.java | 4 +++- .../src/com/intellij/openapi/ui/DialogWrapper.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java index 7c4fbf4d1e80..045589858b59 100644 --- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java +++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java @@ -118,7 +118,9 @@ public abstract class AbstractWizard extends DialogWrapper { panel.add(buttonPanel, BorderLayout.EAST); buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS)); - myHelpButton.putClientProperty("JButton.buttonType", "help"); + if (!UIUtil.isUnderDarcula()) { + myHelpButton.putClientProperty("JButton.buttonType", "help"); + } if (UIUtil.isUnderAquaLookAndFeel()) { myHelpButton.setText(""); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java index ed514b85372a..60fc3bdd26d7 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -462,8 +462,10 @@ public abstract class DialogWrapper { if (hasHelpToMoveToLeftSide) { JButton helpButton = new JButton(getHelpAction()); - helpButton.putClientProperty("JButton.buttonType", "help"); - helpButton.setText(""); + if (!UIUtil.isUnderDarcula()) { + helpButton.putClientProperty("JButton.buttonType", "help"); + helpButton.setText(""); + } helpButton.setMargin(insets); helpButton.setToolTipText(ActionsBundle.actionDescription("HelpTopics")); panel.add(helpButton, BorderLayout.WEST);