From 58f88ffeb8e91175478ad17fb73e4a3bf0562328 Mon Sep 17 00:00:00 2001 From: hogliux Date: Tue, 24 Apr 2018 10:17:46 +0100 Subject: [PATCH] macOS/iOS: Continue to use text layout fallback for fonts loaded from memory You can override this by defining JUCE_FORCE_USE_NATIVE_TEXT_LAYOUT_FOR_MEMORY_FONTS=1 --- modules/juce_graphics/native/juce_mac_Fonts.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/juce_graphics/native/juce_mac_Fonts.mm b/modules/juce_graphics/native/juce_mac_Fonts.mm index 92a5c143a7..c89fb5068e 100644 --- a/modules/juce_graphics/native/juce_mac_Fonts.mm +++ b/modules/juce_graphics/native/juce_mac_Fonts.mm @@ -815,12 +815,12 @@ Typeface::Ptr Font::getDefaultTypefaceForFont (const Font& font) // fallback layout algorithm. static bool canAllTypefacesBeUsedInLayout (const AttributedString& text) { - #if JUCE_MAC && defined (MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11 + #if JUCE_MAC && defined (MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11 && JUCE_FORCE_USE_NATIVE_TEXT_LAYOUT_FOR_MEMORY_FONTS ignoreUnused (text); return true; #else - #if JUCE_MAC + #if JUCE_MAC && JUCE_FORCE_USE_NATIVE_TEXT_LAYOUT_FOR_MEMORY_FONTS if (SystemStats::getOperatingSystemType() >= SystemStats::OperatingSystemType::MacOSX_10_11) return true; #endif