MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-149337 [follow-up] UI fonts are too big

Browse Source 
Reverted changes in UISettings due to a regression.
Filed a separate issue (IDEA-153597) to address the original problem.
This commit is contained in:
Anton Tarasov
2016-03-24 20:39:53 +03:00
parent 53ab052dad
commit a985f5c418
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
+6 -16
View File
@@ -53,15 +53,8 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
/** Not tabbed pane. */
public static final int TABS_NONE = 0;
private String lafID;
public static UISettings getInstance() {
UISettings instance = ServiceManager.getService(UISettings.class);
if (!instance.lafID.equals(UIManager.getLookAndFeel().getID())) {
// Re-init if LaF changed.
instance.init();
}
return instance;
return ServiceManager.getService(UISettings.class);
}
/**
@@ -142,10 +135,6 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
private final EventDispatcher<UISettingsListener> myDispatcher = EventDispatcher.create(UISettingsListener.class);
public UISettings() {
init();
}
private void init() {
tweakPlatformDefaults();
setSystemFontFaceAndSize();
@@ -153,7 +142,6 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
if (scrollToSource != null) {
DEFAULT_AUTOSCROLL_TO_SOURCE = scrollToSource;
}
lafID = UIManager.getLookAndFeel().getID();
}
private void tweakPlatformDefaults() {
@@ -193,9 +181,11 @@ public class UISettings extends SimpleModificationTracker implements PersistentS
}
private void setSystemFontFaceAndSize() {
final Pair<String, Integer> fontData = getSystemFontFaceAndSize();
FONT_FACE = fontData.first;
FONT_SIZE = fontData.second;
if (FONT_FACE == null || FONT_SIZE <= 0) {
final Pair<String, Integer> fontData = getSystemFontFaceAndSize();
FONT_FACE = fontData.first;
FONT_SIZE = fontData.second;
}
}
private static Pair<String, Integer> getSystemFontFaceAndSize() {