From c5c04cd7890ed6088562833cc01beff25aa91d77 Mon Sep 17 00:00:00 2001 From: Valentina Kiryushkina Date: Tue, 7 Mar 2017 13:58:22 +0300 Subject: [PATCH] Fix 22993 Align Ipnb settings fields on different platforms in the same way --- .../plugins/ipnb/configuration/IpnbConfigurable.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java index 378bc399a6a1..5325e21f1442 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java @@ -144,7 +144,7 @@ public class IpnbConfigurable implements SearchableConfigurable { private void createUIComponents() { // TODO: remove this hack - int gap = SystemInfo.isWindows ? 1 : 2; + int gap = SystemInfo.isWindows ? 4 : SystemInfo.isMac ? 8 : 16; mySpecificNotebookSettingsPanel = PlatformUtils.isPyCharmPro() ? new SettingsPanelPro() : new LocalSettingsPanel(true, 0, gap); } @@ -171,7 +171,7 @@ public class IpnbConfigurable implements SearchableConfigurable { myRemote = createModeRadioButton("Remote"); myRemoteSettingsPanel = new RemoteSettingsPanel(isRemote); - myLocalSettingsPanel = new LocalSettingsPanel(!isRemote, DEFAULT_PADDING, 1); + myLocalSettingsPanel = new LocalSettingsPanel(!isRemote, DEFAULT_PADDING, 2); final ButtonGroup group = new ButtonGroup(); myLocal.setSelected(!isRemote); @@ -280,8 +280,8 @@ public class IpnbConfigurable implements SearchableConfigurable { myAdditionalOptions.addFocusListener(createInitialTextFocusAdapter(myAdditionalOptions, DEFAULT_PARAMETERS_TEXT)); initFields(); - setLayout(new MigLayout("insets 0", leftPadding + "unrel[]" + gap + "unrel[grow]", "[][]")); - add(myParametersLabel); + setLayout(new MigLayout("insets 0", leftPadding + "unrel[][grow]", "[][]")); + add(myParametersLabel, "gapafter " + gap); add(myAdditionalOptions, "growx"); if (enabled) { enablePanel(); @@ -351,8 +351,8 @@ public class IpnbConfigurable implements SearchableConfigurable { myInterpreterSetupLinkLabel.setCursor(new Cursor(Cursor.HAND_CURSOR)); createNavigateToInterpreterSettingsListener().installOn(myInterpreterSetupLinkLabel); - - setLayout(new MigLayout("insets 0", DEFAULT_PADDING + "unrel[]5unrel[grow]", "[][][]")); + int gap = SystemInfo.isMac ? 6 : 5; + setLayout(new MigLayout("insets 0", DEFAULT_PADDING + "unrel[]" + gap + "unrel[grow]", "[][][]")); myUsernameLabel = new JBLabel("Username:"); myUsernameField = new JBTextField(); myUsernameField.addFocusListener(createInitialTextFocusAdapter(myUsernameField, DEFAULT_USERNAME_TEXT));