OC-15009 Select theme and behaviour screen does not use SF NS Text for Default and Xcode behaviour

This commit is contained in:
Anton Makeev
2017-02-20 19:19:00 +01:00
parent be01ebbb5f
commit 165f85e577
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -131,7 +131,7 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
protected void initThemes(Collection<ThemeInfo> result) {
if (SystemInfo.isMac) {
result.add(LafManagerImpl.useIntelliJInsteadOfAqua() ? INTELLIJ : AQUA);
result.add(getDefaultLafOnMac());
result.add(DARCULA);
}
else if (SystemInfo.isWindows) {
@@ -150,6 +150,11 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
}
}
@NotNull
protected static ThemeInfo getDefaultLafOnMac() {
return LafManagerImpl.useIntelliJInsteadOfAqua() ? INTELLIJ : AQUA;
}
@NotNull
private ThemeInfo getDefaultTheme() {
if (ApplicationManager.getApplication() != null) {