From e09c29c28b366e8afc8f024877e9386f65af77d0 Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Fri, 25 Sep 2015 17:31:25 +0100 Subject: [PATCH] Ensure UserDefined Font family is not changed by system font changing. Change-Id: I6c99511a70cb86c96c50c918abe000ab802f2158 Signed-off-by: Agnelo Vaz --- dali-toolkit/internal/controls/text-controls/text-field-impl.cpp | 6 +----- dali-toolkit/internal/controls/text-controls/text-label-impl.cpp | 5 +---- dali-toolkit/internal/text/text-controller.cpp | 6 +++--- dali-toolkit/internal/text/text-controller.h | 3 +-- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index 9c3d4c8..f5dda09 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -205,11 +205,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr { const std::string fontFamily = value.Get< std::string >(); DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p FONT_FAMILY %s\n", impl.mController.Get(), fontFamily.c_str() ); - - if( impl.mController->GetDefaultFontFamily() != fontFamily ) - { - impl.mController->SetDefaultFontFamily( fontFamily, true ); // "true" as SetProperty means user defined font so don't change when system font changes. - } + impl.mController->SetDefaultFontFamily( fontFamily ); } break; } diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index 1c31449..153b34c 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -148,10 +148,7 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr const std::string fontFamily = value.Get< std::string >(); DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::SetProperty Property::FONT_FAMILY newFont(%s)\n", fontFamily.c_str() ); - if( impl.mController->GetDefaultFontFamily() != fontFamily ) - { - impl.mController->SetDefaultFontFamily( fontFamily, true ); - } + impl.mController->SetDefaultFontFamily( fontFamily ); } break; } diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index eb02202..6b1e31f 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -229,7 +229,7 @@ int Controller::GetMaximumNumberOfCharacters() return mImpl->mMaximumNumberOfCharacters; } -void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily, bool userDefined ) +void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) { if( !mImpl->mFontDefaults ) { @@ -237,8 +237,8 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily, boo } mImpl->mFontDefaults->mFontDescription.family = defaultFontFamily; - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s userDefined: %s\n", defaultFontFamily.c_str(), userDefined ? "true":"false" ); - mImpl->mUserDefinedFontFamily = userDefined; + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str()); + mImpl->mUserDefinedFontFamily = true; // Clear the font-specific data ClearFontData(); diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h index 3c6125d..5a80e35 100644 --- a/dali-toolkit/internal/text/text-controller.h +++ b/dali-toolkit/internal/text/text-controller.h @@ -178,9 +178,8 @@ public: * @brief Set the default font family. * * @param[in] defaultFontFamily The default font family. - * @param[in] userDefined If set by the user */ - void SetDefaultFontFamily( const std::string& defaultFontFamily, bool userDefined ); + void SetDefaultFontFamily( const std::string& defaultFontFamily ); /** * @brief Retrieve the default font family. -- 2.7.4