From 93a777747ece1712549c41b4e6a01dd7f8be5c08 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Mon, 29 Aug 2016 15:21:44 +0300 Subject: [PATCH] let's try showing currently used font in appearance configurable --- .../src/com/intellij/ide/ui/AppearanceConfigurable.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java index 9721d62e2b7b..5bed13e6d9fb 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java @@ -320,8 +320,11 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab initComponent(); UISettings settings = UISettings.getInstance(); - myComponent.myFontCombo.setFontName(settings.FONT_FACE); - + if (settings.OVERRIDE_NONIDEA_LAF_FONTS) { + myComponent.myFontCombo.setFontName(settings.FONT_FACE); + } else { + myComponent.myFontCombo.setFontName(UIUtil.getLabelFont().getFamily()); + } // todo migrate //myComponent.myAntialiasingCheckBox.setSelected(settings.ANTIALIASING_IN_IDE); //myComponent.myLCDRenderingScopeCombo.setSelectedItem(settings.LCD_RENDERING_SCOPE); @@ -392,7 +395,7 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab UISettings settings = UISettings.getInstance(); boolean isModified = false; - isModified |= !Comparing.equal(myComponent.myFontCombo.getFontName(), settings.FONT_FACE); + isModified |= !Comparing.equal(myComponent.myFontCombo.getFontName(), settings.FONT_FACE) && myComponent.myOverrideLAFFonts.isSelected() != settings.OVERRIDE_NONIDEA_LAF_FONTS; isModified |= !Comparing.equal(myComponent.myFontSizeCombo.getEditor().getItem(), Integer.toString(settings.FONT_SIZE)); isModified |= myComponent.myAntialiasingInIDE.getSelectedItem() != settings.IDE_AA_TYPE;