IDEA-133140 Project Structure dialog has extra borders when opened from Project tool window

This commit is contained in:
Sergey Malenkov
2014-11-19 15:32:07 +03:00
parent 1b21120fa2
commit a7772096ed
3 changed files with 6 additions and 6 deletions
@@ -98,7 +98,7 @@ public class CodeStyleMainPanel extends JPanel implements LanguageSelectorListen
addWaitCard();
JComponent schemes = mySchemesPanel.getPanel();
if (ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")) {
if (Registry.is("ide.new.settings.view")) {
schemes.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
}
add(schemes, BorderLayout.NORTH);
@@ -155,7 +155,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom
}
private boolean isNewSettingsView() {
return ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view");
return Registry.is("ide.new.settings.view");
}
protected void reInitWholePanelIfNeeded() {
@@ -58,7 +58,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
project = getProject(project);
final ConfigurableGroup[] filteredGroups = filterEmptyGroups(groups);
if (Registry.is("ide.new.settings.dialog")) {
return ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")
return Registry.is("ide.new.settings.view")
? new SettingsDialog(project, filteredGroups, toSelect, null)
: new IdeSettingsDialog(project, filteredGroups, toSelect);
}
@@ -156,7 +156,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
group = filterEmptyGroups(group);
final Configurable configurable2Select = id2Select == null ? null : new ConfigurableVisitor.ByID(id2Select).find(group);
if (ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")) {
if (Registry.is("ide.new.settings.view")) {
new SettingsDialog(getProject(project), group, configurable2Select, filter).show();
return;
}
@@ -244,12 +244,12 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
boolean showApplyButton) {
final DialogWrapper editor;
if (parent == null) {
editor = ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")
editor = Registry.is("ide.new.settings.view")
? new SettingsDialog(project, dimensionKey, configurable, showApplyButton)
: new SingleConfigurableEditor(project, configurable, dimensionKey, showApplyButton);
}
else {
editor = ApplicationManager.getApplication().isInternal() && Registry.is("ide.new.settings.view")
editor = Registry.is("ide.new.settings.view")
? new SettingsDialog(parent, dimensionKey, configurable, showApplyButton)
: new SingleConfigurableEditor(parent, configurable, dimensionKey, showApplyButton);
}