From 6d62ca93822ee235c23b8ff89d40ebbab6039da4 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Thu, 20 Nov 2014 16:15:01 +0300 Subject: [PATCH] Fix margins for CodeStyle objects inside TabbedPaneWrapper --- .../options/CodeStyleGenerationConfigurable.form | 2 +- .../application/options/CodeStyleImportForm.form | 3 ++- .../application/options/CodeStyleImportsPanel.java | 1 - .../application/options/JavaDocFormattingPanel.java | 3 +++ .../intellij/json/formatter/JsonCodeStylePanel.form | 2 +- .../application/options/CodeStyleAbstractPanel.java | 4 ++++ .../options/TabbedLanguageCodeStylePanel.java | 13 ++++++++----- .../options/codeStyle/CodeStyleBlankLinesPanel.java | 4 ++-- .../MultilanguageCodeStyleAbstractPanel.java | 3 +++ .../codeStyle/OptionTableWithPreviewPanel.java | 2 +- .../codeStyle/OptionTreeWithPreviewPanel.java | 2 +- .../options/codeStyle/RightMarginForm.form | 2 +- .../arrangement/ArrangementSettingsPanel.java | 1 + .../groovy/codeStyle/GrCodeStyleImportsPanel.form | 2 +- .../groovy/codeStyle/GrCodeStyleImportsPanel.java | 1 - .../application/options/CodeStyleHtmlPanel.form | 2 +- .../application/options/CodeStyleXmlPanel.form | 2 +- 17 files changed, 31 insertions(+), 18 deletions(-) diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form index 6c8a5e4d3489..85992d9bf372 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form @@ -16,7 +16,7 @@ - + diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleImportForm.form b/java/java-impl/src/com/intellij/application/options/CodeStyleImportForm.form index 5f33c8d0fb2a..370492c2c7de 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleImportForm.form +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleImportForm.form @@ -12,10 +12,11 @@ + - + diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java index fb4cd20ad65b..038725a47512 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java @@ -53,7 +53,6 @@ public class CodeStyleImportsPanel extends JPanel { public CodeStyleImportsPanel(CodeStyleSettings settings) { mySettings = settings; setLayout(new BorderLayout()); - setBorder(IdeBorderFactory.createEmptyBorder(2, 2, 2, 2)); add(myWholePanel, BorderLayout.CENTER); myGeneralPanel.add(createGeneralOptionsPanel(), BorderLayout.CENTER); diff --git a/java/java-impl/src/com/intellij/application/options/JavaDocFormattingPanel.java b/java/java-impl/src/com/intellij/application/options/JavaDocFormattingPanel.java index f6cfa9199810..146691dea27a 100644 --- a/java/java-impl/src/com/intellij/application/options/JavaDocFormattingPanel.java +++ b/java/java-impl/src/com/intellij/application/options/JavaDocFormattingPanel.java @@ -21,8 +21,10 @@ import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.StdFileTypes; +import com.intellij.openapi.ui.OnePixelDivider; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; +import com.intellij.ui.border.CustomLineBorder; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -58,6 +60,7 @@ public class JavaDocFormattingPanel extends OptionTreeWithPreviewPanel { } }); + myPanel.setBorder(new CustomLineBorder(OnePixelDivider.BACKGROUND, 1, 0, 0, 0)); myJavaDocPanel.add(BorderLayout.CENTER, myPanel); myJavaDocPanel.add(myEnableCheckBox, BorderLayout.NORTH); } diff --git a/json/src/com/intellij/json/formatter/JsonCodeStylePanel.form b/json/src/com/intellij/json/formatter/JsonCodeStylePanel.form index 1c971bb3ea61..4013e1c38a5d 100644 --- a/json/src/com/intellij/json/formatter/JsonCodeStylePanel.form +++ b/json/src/com/intellij/json/formatter/JsonCodeStylePanel.form @@ -1,7 +1,7 @@
- + diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java index 2b142a4bffb2..e96d06b347fb 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java @@ -35,6 +35,7 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectUtil; +import com.intellij.openapi.ui.OnePixelDivider; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; @@ -42,8 +43,10 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileFactory; import com.intellij.psi.codeStyle.*; +import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.UserActivityListener; import com.intellij.ui.UserActivityWatcher; +import com.intellij.ui.border.CustomLineBorder; import com.intellij.util.Alarm; import com.intellij.util.IncorrectOperationException; import com.intellij.util.LocalTimeCounter; @@ -468,6 +471,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable { protected void installPreviewPanel(final JPanel previewPanel) { previewPanel.setLayout(new BorderLayout()); previewPanel.add(myEditor.getComponent(), BorderLayout.CENTER); + previewPanel.setBorder(new CustomLineBorder(OnePixelDivider.BACKGROUND, 0, 1, 0, 0)); } @NonNls diff --git a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java index af256f6a346b..54d0eff8116c 100644 --- a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java @@ -31,10 +31,12 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectUtil; import com.intellij.openapi.ui.JBMenuItem; import com.intellij.openapi.ui.JBPopupMenu; +import com.intellij.openapi.ui.OnePixelDivider; import com.intellij.openapi.util.Disposer; import com.intellij.psi.codeStyle.*; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TabbedPaneWrapper; +import com.intellij.ui.border.CustomLineBorder; import com.intellij.util.containers.hash.HashSet; import com.intellij.util.ui.GraphicsUtil; import org.jetbrains.annotations.NotNull; @@ -396,6 +398,7 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane protected void installPreviewPanel(JPanel previewPanel) { previewPanel.setLayout(new BorderLayout()); previewPanel.add(getEditor().getComponent(), BorderLayout.CENTER); + previewPanel.setBorder(new CustomLineBorder(OnePixelDivider.BACKGROUND, 0, 1, 0, 0)); } @Override @@ -425,6 +428,7 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane protected void installPreviewPanel(JPanel previewPanel) { previewPanel.setLayout(new BorderLayout()); previewPanel.add(getEditor().getComponent(), BorderLayout.CENTER); + previewPanel.setBorder(new CustomLineBorder(OnePixelDivider.BACKGROUND, 0, 1, 0, 0)); } } @@ -445,6 +449,7 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane protected void installPreviewPanel(JPanel previewPanel) { previewPanel.setLayout(new BorderLayout()); previewPanel.add(getEditor().getComponent(), BorderLayout.CENTER); + previewPanel.setBorder(new CustomLineBorder(OnePixelDivider.BACKGROUND, 0, 1, 0, 0)); } } @@ -563,22 +568,20 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane private final IndentOptionsEditor myEditor; private final LanguageCodeStyleSettingsProvider myProvider; - private final JPanel myTopPanel; - private final JPanel myLeftPanel; + private final JPanel myTopPanel = new JPanel(new BorderLayout()); + private final JPanel myLeftPanel = new JPanel(new BorderLayout()); private final JPanel myRightPanel; protected MyIndentOptionsWrapper(CodeStyleSettings settings, LanguageCodeStyleSettingsProvider provider, IndentOptionsEditor editor) { super(settings); myProvider = provider; - myTopPanel = new JPanel(); - myTopPanel.setLayout(new BorderLayout(8, 0)); - myLeftPanel = new JPanel(new BorderLayout()); myTopPanel.add(myLeftPanel, BorderLayout.WEST); myRightPanel = new JPanel(); installPreviewPanel(myRightPanel); myEditor = editor; if (myEditor != null) { JPanel panel = myEditor.createPanel(); + panel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); JScrollPane scroll = ScrollPaneFactory.createScrollPane(panel, true); scroll.setPreferredSize(new Dimension(panel.getPreferredSize().width + scroll.getVerticalScrollBar().getPreferredSize().width + 5, -1)); myLeftPanel.add(scroll, BorderLayout.CENTER); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java index 4583f6f001e3..1501e1d805ec 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java @@ -55,7 +55,6 @@ public class CodeStyleBlankLinesPanel extends MultilanguageCodeStyleAbstractPane public CodeStyleBlankLinesPanel(CodeStyleSettings settings) { super(settings); - myPanel.setBorder(IdeBorderFactory.createEmptyBorder(2, 2, 2, 2)); init(); } @@ -85,6 +84,7 @@ public class CodeStyleBlankLinesPanel extends MultilanguageCodeStyleAbstractPane new GridBagConstraints(0, 2, 1, 1, 0, 1, GridBagConstraints.NORTH, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); + optionsPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10)); JScrollPane scroll = ScrollPaneFactory.createScrollPane(optionsPanel, true); scroll.getVerticalScrollBar().setUnitIncrement(10); scroll.setMinimumSize(new Dimension(optionsPanel.getPreferredSize().width + scroll.getVerticalScrollBar().getPreferredSize().width + 5, -1)); @@ -92,7 +92,7 @@ public class CodeStyleBlankLinesPanel extends MultilanguageCodeStyleAbstractPane myPanel .add(scroll, - new GridBagConstraints(0, 0, 1, 1, 0, 1, GridBagConstraints.NORTH, GridBagConstraints.BOTH, new Insets(0, 0, 0, 5), 0, 0)); + new GridBagConstraints(0, 0, 1, 1, 0, 1, GridBagConstraints.NORTH, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0)); final JPanel previewPanel = createPreviewPanel(); myPanel diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/MultilanguageCodeStyleAbstractPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/MultilanguageCodeStyleAbstractPanel.java index 7e456d33efc8..76234c95d074 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/MultilanguageCodeStyleAbstractPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/MultilanguageCodeStyleAbstractPanel.java @@ -29,6 +29,7 @@ import com.intellij.openapi.fileTypes.FileTypeEditorHighlighterProviders; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectUtil; +import com.intellij.openapi.ui.OnePixelDivider; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleManager; @@ -36,6 +37,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import com.intellij.ui.AncestorListenerAdapter; +import com.intellij.ui.border.CustomLineBorder; import com.intellij.ui.components.JBTabbedPane; import com.intellij.util.Function; import com.intellij.util.IncorrectOperationException; @@ -246,6 +248,7 @@ public abstract class MultilanguageCodeStyleAbstractPanel extends CodeStyleAbstr else { // If settings are language-specific previewPanel.add(getEditor().getComponent(), BorderLayout.CENTER); + previewPanel.setBorder(new CustomLineBorder(OnePixelDivider.BACKGROUND, 0, 1, 0, 0)); updatePreview(true); } } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java index e75363ed229d..c7a333872a67 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java @@ -85,7 +85,7 @@ public abstract class OptionTableWithPreviewPanel extends MultilanguageCodeStyle }; myPanel.add(scrollPane , new GridBagConstraints(0, 0, 1, 1, 0, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(0, 0, 0, 8), 0, 0)); + new Insets(0, 0, 0, 0), 0, 0)); final JPanel previewPanel = createPreviewPanel(); myPanel.add(previewPanel, diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java index 673178a30117..e386ee12dc06 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java @@ -80,7 +80,7 @@ public abstract class OptionTreeWithPreviewPanel extends MultilanguageCodeStyleA }; myPanel.add(scrollPane, new GridBagConstraints(0, 0, 1, 1, 0, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, - new Insets(0, 0, 0, 8), 0, 0)); + new Insets(0, 0, 0, 0), 0, 0)); JPanel previewPanel = createPreviewPanel(); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.form b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.form index 67f579a77ff5..6a888eae4be0 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.form +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.form @@ -1,7 +1,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementSettingsPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementSettingsPanel.java index 4c5d39cb09b0..01925fc93853 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementSettingsPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementSettingsPanel.java @@ -81,6 +81,7 @@ public abstract class ArrangementSettingsPanel extends CodeStyleAbstractPanel { myGroupingRulesPanel = new ArrangementGroupingRulesPanel(settingsManager, colorsProvider); myMatchingRulesPanel = new ArrangementMatchingRulesPanel(myLanguage, settingsManager, colorsProvider); + myContent.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10)); myContent.add(myGroupingRulesPanel, new GridBag().coverLine().fillCellHorizontally().weightx(1)); myContent.add(myMatchingRulesPanel, new GridBag().fillCell().weightx(1).weighty(1).coverLine()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrCodeStyleImportsPanel.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrCodeStyleImportsPanel.form index 40eed2645da1..ba7e9161780a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrCodeStyleImportsPanel.form +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrCodeStyleImportsPanel.form @@ -16,7 +16,7 @@ - + diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrCodeStyleImportsPanel.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrCodeStyleImportsPanel.java index a890fed35f06..0f6567bd6bf3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrCodeStyleImportsPanel.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GrCodeStyleImportsPanel.java @@ -49,7 +49,6 @@ public class GrCodeStyleImportsPanel extends JPanel { public GrCodeStyleImportsPanel() { setLayout(new BorderLayout()); - setBorder(IdeBorderFactory.createEmptyBorder(2, 2, 2, 2)); add(myWholePanel, BorderLayout.CENTER); myGeneralPanel.add(createGeneralOptionsPanel(), BorderLayout.CENTER); diff --git a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form index 0ddd4cf577f3..bf79ab8f021e 100644 --- a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form +++ b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form @@ -35,7 +35,7 @@ - + diff --git a/xml/impl/src/com/intellij/application/options/CodeStyleXmlPanel.form b/xml/impl/src/com/intellij/application/options/CodeStyleXmlPanel.form index c7895930be0f..890f411e7926 100644 --- a/xml/impl/src/com/intellij/application/options/CodeStyleXmlPanel.form +++ b/xml/impl/src/com/intellij/application/options/CodeStyleXmlPanel.form @@ -18,7 +18,7 @@ - +