SVN: use splitter in update options dialog + use preffered size

This commit is contained in:
irengrig
2011-01-14 14:11:43 +03:00
parent 6554f4cfa5
commit d57099e2dc
3 changed files with 3 additions and 4 deletions
@@ -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);
}
@@ -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);
@@ -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() {