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=2c8390f8447bfe14329222f1bcd6c9ea649254ac;hp=3e0fd35605744fc43cd6cd936e26125ee2331f1d;hpb=73d239b4c5c2c4a558cbaf44bdcc744c8f497c14;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 3e0fd35..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,11 +93,26 @@ 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( int depth ); + + /** * @copydoc Text::ControlInterface::RequestTextRelayout() */ virtual void RequestTextRelayout(); /** + * @copydoc Text::ControlInterface::TextChanged() + */ + virtual void TextChanged(); + + /** * @copydoc Text::ControlInterface::MaxLengthReached() */ virtual void MaxLengthReached(); @@ -120,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; - RenderableActor mRenderableActor; - + Actor mRenderableActor; int mRenderingBackend; + bool mHasBeenStaged:1; }; } // namespace Internal