From 214701473bda8a76c4a3aecbafe1f83bd88c54ab Mon Sep 17 00:00:00 2001 From: Bowon Ryu Date: Tue, 21 Mar 2023 11:15:12 +0900 Subject: [PATCH] Add a condition to ensure FontClient https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-adaptor/+/290153/ Change-Id: Ic67e9d870a12456fe4023d23377d90b753b1e431 Signed-off-by: Bowon Ryu --- dali-toolkit/internal/styling/style-manager-impl.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- 2.7.4