From e2cdb6df5159c0df6a413d4dfd55596c17102c09 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 28 Nov 2013 17:29:39 +0100 Subject: [PATCH] introduced idea.register.bundled.fonts registry to be able to switch off bundled fonts registration in order to avoid garbled text in editor (IDEA-93404) [r=Konstantin.Bulenkov] --- .../platform-impl/src/com/intellij/ui/AppUIUtil.java | 9 ++++++--- .../platform-resources-en/src/misc/registry.properties | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java index 7ae9fb6b6efa..c0bfb6f37fa9 100644 --- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java +++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java @@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.Balloon; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.SystemInfo; +import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.util.PlatformUtils; @@ -123,9 +124,11 @@ public class AppUIUtil { } public static void registerBundledFonts() { - registerFont("/fonts/Inconsolata.ttf"); - registerFont("/fonts/SourceCodePro-Regular.ttf"); - registerFont("/fonts/SourceCodePro-Bold.ttf"); + if (Registry.is("ide.register.bundled.fonts")) { + registerFont("/fonts/Inconsolata.ttf"); + registerFont("/fonts/SourceCodePro-Regular.ttf"); + registerFont("/fonts/SourceCodePro-Bold.ttf"); + } } private static void registerFont(@NonNls String name) { diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties index bbaff8c4512c..a80fd2792741 100644 --- a/platform/platform-resources-en/src/misc/registry.properties +++ b/platform/platform-resources-en/src/misc/registry.properties @@ -107,6 +107,8 @@ ide.tooltip.autoDismissDeadZone=300 ide.balloon.shadowEnabled=true ide.balloon.shadow.size=15 ide.expansion.hints.enabled=true +ide.register.bundled.fonts=true +ide.register.bundled.fonts.description=Disables automatic registration of bundled fonts: SourceCodePro, Inconsolata editor.balloonHints=true editor.mouseSelectionStateResetTimeout=1000