ScopeChooserCombo. Restrict for preffered size.

This commit is contained in:
Evgeny Zakrevsky
2012-03-13 15:49:06 +04:00
parent ad2f4574df
commit 36acc0bec3
2 changed files with 11 additions and 11 deletions
@@ -276,17 +276,7 @@ public abstract class AbstractFindUsagesDialog extends DialogWrapper {
if (isInFileOnly()) return null;
JPanel optionsPanel = new JPanel(new BorderLayout());
String scope = myFindUsagesOptions.searchScope.getDisplayName();
myScopeCombo = new ScopeChooserCombo(myProject, mySearchInLibrariesAvailable, true, scope) {
@Override
public Dimension getMinimumSize() {
return new Dimension(200, super.getMinimumSize().height);
}
@Override
public Dimension getPreferredSize() {
return new Dimension(400, super.getPreferredSize().height);
}
};
myScopeCombo = new ScopeChooserCombo(myProject, mySearchInLibrariesAvailable, true, scope);
Disposer.register(myDisposable, myScopeCombo);
optionsPanel.add(myScopeCombo, BorderLayout.CENTER);
JComponent separator = SeparatorFactory.createSeparator(FindBundle.message("find.scope.label"), myScopeCombo.getComboBox());
@@ -56,9 +56,11 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.*;
import java.util.List;
public class ScopeChooserCombo extends ComboboxWithBrowseButton implements Disposable {
private Project myProject;
@@ -179,6 +181,14 @@ public class ScopeChooserCombo extends ComboboxWithBrowseButton implements Dispo
return model;
}
@Override
public Dimension getPreferredSize() {
if (isPreferredSizeSet()) {
return super.getPreferredSize();
}
Dimension preferredSize = super.getPreferredSize();
return new Dimension(Math.min(400, preferredSize.width), preferredSize.height);
}
private void createPredefinedScopeDescriptors(DefaultComboBoxModel model) {
for (SearchScope scope : getPredefinedScopes(myProject, DataManager.getInstance().getDataContext(), mySuggestSearchInLibs, myPrevSearchFiles, true, true)) {