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
Framework for Font styles
[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
fdce0ed
..
00ae80d
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@
-24,9
+24,10
@@
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/text/rendering-backend.h>
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
#include <dali-toolkit/internal/text/rendering/text-backend.h>
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
#include <dali-toolkit/internal/text/rendering/text-backend.h>
-#include <dali-toolkit/
public-api/text/rendering-backend
.h>
+#include <dali-toolkit/
internal/styling/style-manager-impl
.h>
using Dali::Toolkit::Text::LayoutEngine;
using Dali::Toolkit::Text::Backend;
using Dali::Toolkit::Text::LayoutEngine;
using Dali::Toolkit::Text::Backend;
@@
-219,6
+220,11
@@
void TextLabel::OnInitialize()
mController = Text::Controller::New( *this );
}
mController = Text::Controller::New( *this );
}
+void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change )
+{
+ GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+}
+
Vector3 TextLabel::GetNaturalSize()
{
return mController->GetNaturalSize();
Vector3 TextLabel::GetNaturalSize()
{
return mController->GetNaturalSize();
@@
-265,7
+271,7
@@
void TextLabel::RequestTextRelayout()
}
TextLabel::TextLabel()
}
TextLabel::TextLabel()
-: Control( ControlBehaviour(
CONTROL_BEHAVIOUR_NONE
) ),
+: Control( ControlBehaviour(
REQUIRES_STYLE_CHANGE_SIGNALS
) ),
mRenderingBackend( DEFAULT_RENDERING_BACKEND )
{
}
mRenderingBackend( DEFAULT_RENDERING_BACKEND )
{
}