From: Eunki Hong <eunkiki.hong@samsung.com>
Date: Thu, 23 Mar 2023 06:11:18 +0000 (+0000)
Subject: Merge "Change scope of GlyphBufferData" into devel/master
X-Git-Tag: dali_2.2.19~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=df6d30a6a1e89526ccd9ac56d5442f4dd218090e;hp=2edfa9ffd8a54dfa706caf27ff27163e3b6ee97c

Merge "Change scope of GlyphBufferData" into devel/master
---

diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp
index e6ad82f..8cd7ba5 100644
--- a/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -118,7 +118,6 @@ StyleManager::StyleManager()
   if(mStyleMonitor)
   {
     mStyleMonitor.StyleChangeSignal().Connect(this, &StyleManager::StyleMonitorChange);
-    mDefaultFontSize = mStyleMonitor.GetDefaultFontSize();
   }
 
   // Set the full path for the default style theme.
@@ -471,6 +470,11 @@ void StyleManager::ApplyStyle(Toolkit::Builder builder, Toolkit::Control control
     builder.ApplyStyle(styleName, control);
   }
 
+  if(mDefaultFontSize == -1 && mStyleMonitor.EnsureFontClientCreated())
+  {
+    mDefaultFontSize = mStyleMonitor.GetDefaultFontSize();
+  }
+
   if(mDefaultFontSize >= 0)
   {
     // Apply the style for logical font size