fix: creating bold font by default

qlik-oss · Jun 6, 2022 · bcc8269 · bcc8269
1 parent 4295caa
commit bcc8269
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cpp/jsi/Text.cpp b/cpp/jsi/Text.cpp
@@ -34,13 +34,13 @@ Text::Text(jsi::Runtime &rt, const jsi::Object &object) {
   text = object.getProperty(rt, "text").toString(rt).utf8(rt);
   SkScalar fontSize = static_cast<SkScalar>(Helium::toPx(object.getProperty(rt, "fontSize").asNumber()));
   auto fontFamily = object.getProperty(rt, "fontFamily").toString(rt).utf8(rt);
-  auto typeFace = SkTypeface::MakeFromName(fontFamily.c_str(), SkFontStyle::Bold());
+  auto typeFace = SkTypeface::MakeFromName(fontFamily.c_str(), SkFontStyle::Normal());
+  auto fontManager = SkFontMgr::RefDefault();
   if(!isASCII(text)) {
     auto data = text.c_str();
-    auto sk = SkFontMgr::RefDefault();
     const char *bcp47_locale = "";
     SkUnichar  unichar = nextUTF8(&data, data + text.size() );
-    auto tp = sk->matchFamilyStyleCharacter(fontFamily.c_str(), SkFontStyle::Normal(),
+    auto tp = fontManager->matchFamilyStyleCharacter(fontFamily.c_str(), SkFontStyle::Normal(),
                                               &bcp47_locale, 1, unichar);
     typeFace.reset(tp);
   }