projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialise Controller's DefaultFont description to that of the Platform default font
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.cpp
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
f946cf2
..
1c31449
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@
-147,6
+147,7
@@
void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr
{
const std::string fontFamily = value.Get< std::string >();
{
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 );
if( impl.mController->GetDefaultFontFamily() != fontFamily )
{
impl.mController->SetDefaultFontFamily( fontFamily, true );
@@
-457,9
+458,9
@@
void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::
{
case StyleChange::DEFAULT_FONT_CHANGE:
{
{
case StyleChange::DEFAULT_FONT_CHANGE:
{
- DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::OnStyleChange StyleChange::DEFAULT_FONT_CHANGE\n");
// Property system did not set the font so should update it.
std::string newFont = styleManager.GetDefaultFontFamily();
// Property system did not set the font so should update it.
std::string newFont = styleManager.GetDefaultFontFamily();
+ DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::OnStyleChange StyleChange::DEFAULT_FONT_CHANGE newFont(%s)\n", newFont.c_str() );
mController->UpdateAfterFontChange( newFont );
break;
}
mController->UpdateAfterFontChange( newFont );
break;
}