X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-label-impl.h;h=ae88beb1a00759ad1bbd7bf442e72f8a59bb8643;hb=d8cbd048a3d77a627c97eba193afd3c0514a789a;hp=87ca9f8aed29d6c7107cc214064e735c29162bb4;hpb=f6e6320c0fce19229bdec06a996433c09b2d8fea;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.h b/dali-toolkit/internal/controls/text-controls/text-label-impl.h index 87ca9f8..ae88beb 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h @@ -93,9 +93,14 @@ private: // From Control virtual float GetHeightForWidth( float width ); /** + * @copydoc Text::ControlInterface::AddDecoration() + */ + virtual void AddDecoration( Actor& actor, bool needsClipping ); + + /** * @copydoc Control::OnStageConnection() */ - virtual void OnStageConnection( unsigned int depth ); + virtual void OnStageConnection( int depth ); /** * @copydoc Text::ControlInterface::RequestTextRelayout() @@ -130,13 +135,21 @@ private: TextLabel(const TextLabel&); TextLabel& operator=(const TextLabel& rhs); + // Connection needed to re-render text, when a Text Label returns to the stage + void OnStageConnect( Dali::Actor actor ); + + /** + * @brief Render view, create and attach actor(s) to this Text Label + */ + void RenderText(); + private: // Data Text::ControllerPtr mController; Text::RendererPtr mRenderer; Actor mRenderableActor; int mRenderingBackend; - unsigned int mDepth; + bool mHasBeenStaged:1; }; } // namespace Internal