From bf1b01378e0cb1e6ead942485382eb00ffd857f5 Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Mon, 12 Dec 2011 21:34:47 +0300 Subject: [PATCH 1/3] IDEA-78298 Nika RC2: Find Usages dialog is screen-wide --- .../find/findUsages/AbstractFindUsagesDialog.java | 12 +++++++++++- .../src/com/intellij/find/impl/FindDialog.java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java b/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java index 06f08c07f2cb..9ed96b7103cf 100644 --- a/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java +++ b/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java @@ -276,7 +276,17 @@ 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); + 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); + } + }; Disposer.register(myDisposable, myScopeCombo); optionsPanel.add(myScopeCombo, BorderLayout.CENTER); JComponent separator = SeparatorFactory.createSeparator(FindBundle.message("find.scope.label"), myScopeCombo.getComboBox()); diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java index 01c6bb74aee3..d7851e85b41a 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java @@ -769,7 +769,7 @@ public class FindDialog extends DialogWrapper { gbConstraints.gridx = 1; gbConstraints.weightx = 1; - myDirectoryComboBox = new ComboBox(-1); + myDirectoryComboBox = new ComboBox(200); Component editorComponent = myDirectoryComboBox.getEditor().getEditorComponent(); if (editorComponent instanceof JTextField) { JTextField field = (JTextField)editorComponent; From fbec25af5af41f6acf5261a1d7508d9fd664ae82 Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Mon, 5 Dec 2011 16:39:00 +0300 Subject: [PATCH 2/3] EA-32377 - NPE: SimpleColoredComponent.computePreferredSize --- .../src/com/intellij/ui/SimpleColoredComponent.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java index 5c5749e684b4..fe90cc54a9ab 100644 --- a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java +++ b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java @@ -366,8 +366,10 @@ public class SimpleColoredComponent extends JComponent implements Accessible { // Take into accound that the component itself can have a border final Insets insets = getInsets(); - width += insets.left + insets.right; - height += insets.top + insets.bottom; + if (insets != null) { + width += insets.left + insets.right; + height += insets.top + insets.bottom; + } return new Dimension(width, height); } From 15b6bbf2aebe05caaa6ae1aa1441e8b96c71dc4f Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Mon, 5 Dec 2011 16:38:26 +0300 Subject: [PATCH 3/3] EA-31348 - NPE: AppearanceConfigurable$MyComponent.access$000 --- .../src/com/intellij/ide/ui/AppearanceConfigurable.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java index 0d8c0b80ef1b..40656f0db866 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java @@ -49,11 +49,15 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab myComponent = new MyComponent(); } - public JComponent createComponent() { + private void initComponent() { if (myComponent == null) { myComponent = new MyComponent(); } + } + + public JComponent createComponent() { + initComponent(); DefaultComboBoxModel aModel = new DefaultComboBoxModel(UIUtil.getValidFontNames(false)); myComponent.myFontCombo.setModel(aModel); myComponent.myFontSizeCombo.setModel(new DefaultComboBoxModel(UIUtil.getStandardFontSizes())); @@ -99,6 +103,7 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab } public void apply() { + initComponent(); UISettings settings = UISettings.getInstance(); String temp = (String)myComponent.myFontSizeCombo.getEditor().getItem(); int _fontSize = -1; @@ -183,6 +188,7 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab } public void reset() { + initComponent(); UISettings settings = UISettings.getInstance(); myComponent.myFontCombo.setSelectedItem(settings.FONT_FACE); @@ -218,6 +224,7 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab } public boolean isModified() { + initComponent(); UISettings settings = UISettings.getInstance(); boolean isModified = false;