From 3bf03e246fdde586fb43b839662b7f51e173fe6a Mon Sep 17 00:00:00 2001 From: Stanislav Dombrovsky Date: Wed, 15 Nov 2017 09:38:15 +0000 Subject: [PATCH] OC-15178 Automatically set some settings when user selects Xcode behaviour [fix 2 typos] --- .../src/com/intellij/ide/customize/WelcomeWizardHelper.kt | 2 +- .../src/com/intellij/ide/projectView/impl/ProjectViewImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/customize/WelcomeWizardHelper.kt b/platform/lang-impl/src/com/intellij/ide/customize/WelcomeWizardHelper.kt index 9d3e2841260f..24bfa0223485 100644 --- a/platform/lang-impl/src/com/intellij/ide/customize/WelcomeWizardHelper.kt +++ b/platform/lang-impl/src/com/intellij/ide/customize/WelcomeWizardHelper.kt @@ -58,7 +58,7 @@ class WelcomeWizardHelper : ApplicationComponent { } WelcomeWizardUtil.getAppearanceFontSize()?.let { UISettings.instance.overrideLafFonts = true - UISettings.instance.fontSize = 12 + UISettings.instance.fontSize = it } WelcomeWizardUtil.getAppearanceFontFace()?.let { UISettings.instance.overrideLafFonts = true diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index 42a182094f1a..ea5ee105495d 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -1921,7 +1921,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo @Override public void setManualOrder(@NotNull String paneId, final boolean enabled) { if (isGlobalOptions()) { - getGlobalOptions().setAutoscrollToSource(enabled); + getGlobalOptions().setManualOrder(enabled); } setPaneOption(myManualOrder, enabled, paneId, false); final AbstractProjectViewPane pane = getProjectViewPaneById(paneId);