summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fxge/ge/cfx_fontmapper.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/fxge/ge/cfx_fontmapper.cpp b/core/fxge/ge/cfx_fontmapper.cpp
index 02143ecc59..064fc9610a 100644
--- a/core/fxge/ge/cfx_fontmapper.cpp
+++ b/core/fxge/ge/cfx_fontmapper.cpp
@@ -582,15 +582,16 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name,
bItalic = italic_angle != 0;
weight = old_weight;
}
- if (family.Find("Narrow") > 0 || family.Find("Condensed") > 0) {
#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
+ if (SubstName.Find("Narrow") > 0 || SubstName.Find("Condensed") > 0)
family = "LiberationSansNarrow";
#elif _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
+ if (family.Find("Narrow") > 0 || family.Find("Condensed") > 0)
family = "RobotoCondensed";
#else
+ if (family.Find("Narrow") > 0 || family.Find("Condensed") > 0)
family = "ArialNarrow";
-#endif
- }
+#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
} else {
pSubstFont->m_bSubstCJK = true;
if (nStyle)