let's try showing currently used font in appearance configurable

This commit is contained in:
Dennis Ushakov
2016-08-29 15:28:28 +03:00
parent 9c0bc4ce17
commit 93a777747e
@@ -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;