From 551cfe36c65329d8ba10f4140a789f2c61ba3182 Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Mon, 26 Dec 2011 22:30:50 +0400 Subject: [PATCH] IDEA-79296 Can't edit HTML code style settings with low screen resolution --- .../intellij/ui/components/JBScrollPane.java | 8 + .../options/CodeStyleHtmlPanel.form | 641 +++++++++--------- .../options/CodeStyleHtmlPanel.java | 14 + 3 files changed, 350 insertions(+), 313 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java index bb9196113d16..e72e1b24ea86 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java @@ -88,6 +88,14 @@ public class JBScrollPane extends JScrollPane { return new MyScrollBar(JScrollBar.HORIZONTAL); } + public boolean isHaveBorder() { + return getBorder() != null; + } + + public void setHaveBorder(boolean haveBorder) { + setBorder(haveBorder ? IdeBorderFactory.createBorder() : null); + } + @Override protected JViewport createViewport() { return new JBViewport(); diff --git a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form index dff5cd64df47..b547b5288445 100644 --- a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form +++ b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.form @@ -1,324 +1,13 @@
- + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -328,6 +17,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java index 80fabfee6ca3..4af26f0b6d2d 100644 --- a/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java +++ b/xml/impl/src/com/intellij/application/options/CodeStyleHtmlPanel.java @@ -26,11 +26,13 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ArrayUtil; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; @@ -60,6 +62,7 @@ public class CodeStyleHtmlPanel extends CodeStyleAbstractPanel { private JCheckBox myWrapText; private JCheckBox myShouldKeepLineBreaksInText; private TextFieldWithBrowseButton myDontBreakIfInlineContent; + private JBScrollPane myJBScrollPane; public CodeStyleHtmlPanel(CodeStyleSettings settings) { super(settings); @@ -89,6 +92,17 @@ public class CodeStyleHtmlPanel extends CodeStyleAbstractPanel { return XmlHighlighterFactory.createXMLHighlighter(scheme); } + private void createUIComponents() { + myJBScrollPane = new JBScrollPane() { + @Override + public Dimension getPreferredSize() { + Dimension prefSize = super.getPreferredSize(); + return new Dimension(prefSize.width + 15, prefSize.height); + } + }; + myJBScrollPane.setHaveBorder(false); + } + private static void customizeField(final String title, final TextFieldWithBrowseButton uiField) { uiField.getTextField().setEditable(false); uiField.setButtonIcon(PlatformIcons.OPEN_EDIT_DIALOG_ICON);