MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ui: pass help button as a parameter

Browse Source 
fix IDEA-146932 under linux and darcula LaF
This commit is contained in:
Aleksey Pivovarov
2016-12-20 13:42:44 +03:00
parent f672acfc27
commit ceaf0d085b
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+10 -16
View File
@@ -569,7 +569,7 @@ public abstract class DialogWrapper {
}
@NotNull
private static JPanel addDoNotShowCheckBox(@NotNull JComponent southPanel, @NotNull JComponent checkBox) {
private static JPanel addDoNotShowCheckBox(@NotNull JComponent southPanel, @NotNull JComponent checkBox, @Nullable JComponent helpButton) {
final JPanel panel = new JPanel(new BorderLayout());
JPanel wrapper = new JPanel(new GridBagLayout());
@@ -577,20 +577,13 @@ public abstract class DialogWrapper {
panel.add(wrapper, BorderLayout.WEST);
panel.add(southPanel, BorderLayout.EAST);
checkBox.setBorder(JBUI.Borders.emptyRight(20));
if (SystemInfo.isMac || (SystemInfo.isWindows && Registry.is("ide.intellij.laf.win10.ui"))) {
JButton helpButton = null;
for (JButton button : UIUtil.findComponentsOfType(southPanel, JButton.class)) {
if ("help".equals(button.getClientProperty("JButton.buttonType"))) {
helpButton = button;
break;
}
}
if (helpButton != null) {
return JBUI.Panels.simplePanel(panel).addToLeft(helpButton);
}
}
return panel;
if (helpButton != null) {
return JBUI.Panels.simplePanel(panel).addToLeft(helpButton);
}
else {
return panel;
}
}
@NotNull
@@ -645,9 +638,10 @@ public abstract class DialogWrapper {
}
}
JComponent helpButton = null;
if (hasHelpToMoveToLeftSide) {
if (!(SystemInfo.isWindows && (UIUtil.isUnderDarcula() || UIUtil.isUnderIntelliJLaF()) && Registry.is("ide.win.frame.decoration"))) {
JButton helpButton = createHelpButton(insets);
helpButton = createHelpButton(insets);
panel.add(helpButton, BorderLayout.WEST);
}
}
@@ -663,7 +657,7 @@ public abstract class DialogWrapper {
JComponent doNotAskCheckbox = createDoNotAskCheckbox();
if (doNotAskCheckbox != null) {
panel = addDoNotShowCheckBox(panel, doNotAskCheckbox);
panel = addDoNotShowCheckBox(panel, doNotAskCheckbox, helpButton);
}
if (getStyle() == DialogStyle.COMPACT) {