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-field-impl.cpp
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
bfa89f6
..
5f8d498
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@
-28,19
+28,13
@@
#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/internal/styling/style-manager-impl.h>
using namespace Dali::Toolkit::Text;
using namespace Dali::Toolkit::Text;
-namespace
-{
-
-const unsigned int DEFAULT_RENDERING_BACKEND = 0;
-
-} // namespace
-
-
namespace Dali
{
namespace Dali
{
@@
-52,6
+46,11
@@
namespace Internal
namespace
{
namespace
{
+ const unsigned int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND;
+}
+
+namespace
+{
// Type registration
BaseHandle Create()
// Type registration
BaseHandle Create()
@@
-392,6
+391,11
@@
void TextField::OnInitialize()
}
}
}
}
+void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change )
+{
+ GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+}
+
Vector3 TextField::GetNaturalSize()
{
return mController->GetNaturalSize();
Vector3 TextField::GetNaturalSize()
{
return mController->GetNaturalSize();
@@
-497,7
+501,7
@@
void TextField::EnableClipping( bool clipping, const Vector2& size )
}
TextField::TextField()
}
TextField::TextField()
-: Control( ControlBehaviour(
CONTROL_BEHAVIOUR_NONE
) ),
+: Control( ControlBehaviour(
REQUIRES_STYLE_CHANGE_SIGNALS
) ),
mRenderingBackend( DEFAULT_RENDERING_BACKEND ),
mExceedPolicy( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP )
{
mRenderingBackend( DEFAULT_RENDERING_BACKEND ),
mExceedPolicy( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP )
{