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
Merge "Stop setting crazy Z value with controls (at the moment depth is ignored by...
[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
77da8f9
..
290c64f
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@
-28,6
+28,7
@@
#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/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/text-view.h>
#include <dali-toolkit/internal/styling/style-manager-impl.h>
using Dali::Toolkit::Text::LayoutEngine;
#include <dali-toolkit/internal/styling/style-manager-impl.h>
using Dali::Toolkit::Text::LayoutEngine;
@@
-453,6
+454,7
@@
void TextLabel::OnInitialize()
// Enable the text ellipsis.
LayoutEngine& engine = mController->GetLayoutEngine();
engine.SetTextEllipsisEnabled( true );
// Enable the text ellipsis.
LayoutEngine& engine = mController->GetLayoutEngine();
engine.SetTextEllipsisEnabled( true );
+ self.OnStageSignal().Connect( this, &TextLabel::OnStageConnect );
}
void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
}
void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
@@
-479,27
+481,48
@@
void TextLabel::OnRelayout( const Vector2& size, RelayoutContainer& container )
{
mRenderer = Backend::Get().NewRenderer( mRenderingBackend );
}
{
mRenderer = Backend::Get().NewRenderer( mRenderingBackend );
}
+ RenderText();
+ }
+}
- RenderableActor renderableActor;
- if( mRenderer )
- {
- renderableActor = mRenderer->Render( mController->GetView() );
- }
+void TextLabel::RequestTextRelayout()
+{
+ RelayoutRequest();
+}
- if( renderableActor != mRenderableActor )
- {
- UnparentAndReset( mRenderableActor );
+void TextLabel::RenderText()
+{
+ Actor self = Self();
+ Actor renderableActor;
+ if( mRenderer )
+ {
+ renderableActor = mRenderer->Render( mController->GetView(), self.GetHierarchyDepth() );
+ }
- if( renderableActor )
- {
- const Vector2& alignmentOffset = mController->GetAlignmentOffset();
- renderableActor.SetPosition( alignmentOffset.x, alignmentOffset.y );
+ if( renderableActor != mRenderableActor )
+ {
+ UnparentAndReset( mRenderableActor );
- Self().Add( renderableActor );
- }
+ if( renderableActor )
+ {
+ const Vector2& alignmentOffset = mController->GetAlignmentOffset();
+ renderableActor.SetPosition( alignmentOffset.x, alignmentOffset.y );
-
mRenderableActor = renderableActor
;
+
self.Add( renderableActor )
;
}
}
+ mRenderableActor = renderableActor;
+ }
+}
+
+void TextLabel::OnStageConnect( Dali::Actor actor )
+{
+ if ( mHasBeenStaged )
+ {
+ RenderText();
+ }
+ else
+ {
+ mHasBeenStaged = true;
}
}
}
}
@@
-508,9
+531,12
@@
void TextLabel::AddDecoration( Actor& actor, bool needsClipping )
// TextLabel does not show decorations
}
// TextLabel does not show decorations
}
-void TextLabel::
RequestTextRelayout(
)
+void TextLabel::
OnStageConnection( int depth
)
{
{
- RelayoutRequest();
+ // Call the Control::OnStageConnection() to set the depth of the background.
+ Control::OnStageConnection( depth );
+
+ // The depth of the text renderer is set in the RenderText() called from OnRelayout().
}
void TextLabel::TextChanged()
}
void TextLabel::TextChanged()
@@
-525,7
+551,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 ),
+ mHasBeenStaged( false )
{
}
{
}