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

'Consolas' as default Windows font

Browse Source
This commit is contained in:
Rustam Vishnyakov
2017-04-27 22:14:38 +03:00
parent d50e43ca41
commit fd70048a61
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-api/src/com/intellij/openapi/editor/colors/FontPreferences.java
+3 -1
View File
@@ -31,7 +31,8 @@ public interface FontPreferences {
float DEFAULT_LINE_SPACING = 1.0f;
String MAC_OS_DEFAULT_FONT_FAMILY = "Menlo";
String LINUX_DEFAULT_FONT_FAMILY = "DejaVu Sans Mono";
String WINDOWS_DEFAULT_FONT_FAMILY = "Monospaced";
String WINDOWS_DEFAULT_FONT_FAMILY = "Consolas";
String FALLBACK_FONT_FAMILY = "Monospaced";
@NotNull
List<String> getEffectiveFontFamilies();
@@ -84,6 +85,7 @@ public interface FontPreferences {
return font.getFontName();
}
}
return FALLBACK_FONT_FAMILY;
}
return WINDOWS_DEFAULT_FONT_FAMILY;
}
platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java
+2 -2
View File
@@ -67,11 +67,11 @@ public class EditorColorsSchemeImplTest extends EditorColorSchemeTestCase {
/**
* TODO<rv> FIX PROPERLY
* This is a hack: since font name is taken from default scheme (why?) where it is explicitly defined as "Dejavu Sans", font names
* do not match because default font name on linux in headless environment falls back to WINDOWS_DEFAULT_FONT_FAMILY (why?)
* do not match because default font name on linux in headless environment falls back to FALLBACK_FONT_FAMILY
*/
private static String substLinuxFontName(@NotNull String fontName) {
return SystemInfo.isLinux && GraphicsEnvironment.isHeadless() && FontPreferences.LINUX_DEFAULT_FONT_FAMILY.equals(fontName)?
FontPreferences.WINDOWS_DEFAULT_FONT_FAMILY :
FontPreferences.FALLBACK_FONT_FAMILY :
fontName;
}