From 165f85e577665f79b48f799ee5771644daa08836 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Mon, 20 Feb 2017 19:08:41 +0100 Subject: [PATCH] OC-15009 Select theme and behaviour screen does not use SF NS Text for Default and Xcode behaviour --- .../ide/customize/CustomizeUIThemeStepPanel.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java index 648050558d32..0e9b1306f84a 100644 --- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java @@ -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 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) {