diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MultipleRootEditorWithSplitter.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MultipleRootEditorWithSplitter.java index 4b0da88b7088..193d46797cdc 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MultipleRootEditorWithSplitter.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/MultipleRootEditorWithSplitter.java @@ -70,7 +70,7 @@ public class MultipleRootEditorWithSplitter extends JPanel { final JPanel panel = rootToPanel.get(root).getPanel(); myConfigureRootPanel.add(panel, root.getPath()); if (panel.getMinimumSize().width > 0) { - minimumRightSize = Math.max(minimumRightSize, panel.getMinimumSize().width); + minimumRightSize = Math.max(minimumRightSize, panel.getPreferredSize().width); } listModel.addElement(root); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegrateRootOptionsPanel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegrateRootOptionsPanel.java index 7172f2a65f95..ef03f2675588 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegrateRootOptionsPanel.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnIntegrateRootOptionsPanel.java @@ -24,7 +24,6 @@ import org.jetbrains.idea.svn.SvnVcs; import org.jetbrains.idea.svn.dialogs.SelectLocationDialog; import javax.swing.*; -import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -43,7 +42,7 @@ public class SvnIntegrateRootOptionsPanel implements SvnPanel{ myRoot = root; myVcs = vcs; - myPanel.setMinimumSize(new Dimension(670, 70)); + //myPanel.setMinimumSize(new Dimension(670, 70)); myMergeText1.setEditable(true); myUrlLabel1.setLabelFor(myMergeText1); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java index aa1dcb2e593c..4ec8a5da4a71 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java @@ -61,7 +61,7 @@ public class SvnUpdateRootOptionsPanel implements SvnPanel{ myVcs = vcs; myIsNested = FilePathUtil.isNested(roots, myRoot); - myPanel.setMinimumSize(new Dimension(320, 70)); + //myPanel.setMinimumSize(new Dimension(320, 70)); myURLText.setEditable(true); myURLText.addActionListener(new ActionListener() {