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
Uses depth within tree to set the depth index of text controls and their renderers.
[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
35761df
..
612ebe7
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@
-466,10
+466,10
@@
void TextLabel::OnRelayout( const Vector2& size, RelayoutContainer& container )
mRenderer = Backend::Get().NewRenderer( mRenderingBackend );
}
mRenderer = Backend::Get().NewRenderer( mRenderingBackend );
}
-
Renderable
Actor renderableActor;
+ Actor renderableActor;
if( mRenderer )
{
if( mRenderer )
{
- renderableActor = mRenderer->Render( mController->GetView() );
+ renderableActor = mRenderer->Render( mController->GetView()
, mDepth
);
}
if( renderableActor != mRenderableActor )
}
if( renderableActor != mRenderableActor )
@@
-494,6
+494,16
@@
void TextLabel::RequestTextRelayout()
RelayoutRequest();
}
RelayoutRequest();
}
+void TextLabel::OnStageConnection( unsigned int depth )
+{
+ mDepth = depth;
+}
+
+void TextLabel::TextChanged()
+{
+ // TextLabel does not provide a signal for this
+}
+
void TextLabel::MaxLengthReached()
{
// Pure Virtual from TextController Interface, only needed when inputting text
void TextLabel::MaxLengthReached()
{
// Pure Virtual from TextController Interface, only needed when inputting text
@@
-501,7
+511,8
@@
void TextLabel::MaxLengthReached()
TextLabel::TextLabel()
: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
TextLabel::TextLabel()
: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
- mRenderingBackend( DEFAULT_RENDERING_BACKEND )
+ mRenderingBackend( DEFAULT_RENDERING_BACKEND ),
+ mDepth( 0 )
{
}
{
}