From a7772096edfbb417d9b812f5819266e54ab979a4 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Wed, 19 Nov 2014 15:30:32 +0300 Subject: [PATCH] IDEA-133140 Project Structure dialog has extra borders when opened from Project tool window --- .../application/options/codeStyle/CodeStyleMainPanel.java | 2 +- .../com/intellij/openapi/ui/MasterDetailsComponent.java | 2 +- .../com/intellij/ide/actions/ShowSettingsUtilImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java index 391065efffeb..7396ea12ef7a 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java @@ -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); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java index 92c7f0f09db9..6ffbb02ffd66 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -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() { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java index f7f14547e8aa..b1130dd9705f 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java @@ -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); }