X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpopup%2Fpopup-impl.h;h=6a6fc0e005d7081d98384909ad0a1e19669acc6d;hb=9f1abc9d8b332a4a619173082cc2622f3c4c6125;hp=b716c0996a61af31bc7d48c0989a3a51ff1781f4;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h index b716c09..6a6fc0e 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.h +++ b/dali-toolkit/internal/controls/popup/popup-impl.h @@ -83,14 +83,9 @@ public: void SetTitle( const std::string& text ); /** - * @copydoc Toolkit::Popup::SetTitle( TextView titleActor ) - */ - void SetTitle( Toolkit::TextView titleActor ); - - /** * @copydoc Toolkit::Popup::GetTitle */ - Toolkit::TextView GetTitle() const; + const std::string& GetTitle() const; /** * @copydoc Toolkit::Popup::AddButton @@ -251,7 +246,12 @@ private: virtual void OnControlChildAdd( Actor& child ); /** - * @copydoc Control::OnRelayout() + * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& size ) + */ + virtual void OnControlSizeSet( const Vector3& size ); + + /** + * @copydoc Control::OnRelayOut() */ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container ); @@ -310,7 +310,6 @@ private: Actor mBackgroundImage; ///< Stores the background image. Actor mButtonAreaImage; ///< Stores the button background image. - Toolkit::TextView mTitle; ///< Stores the text title. Actor mContent; ///< Stores popup's content. Actor mBottomBg; ///< bottom button bar background. ImageActor is replaced with Actor due to hidden image. Actor mTailImage; ///< Stores the tail image