X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Ftext-view%2Ftext-view-impl.h;h=7ac52463eede75e6ff5f08f51aca144bdbab449c;hp=55642960d426fe87ec2a668a8d1d232c333b6e4c;hb=cf229fa2e4f00e5fe727eab2d215868bf79ac524;hpb=53760bfd7bdb7fc5e6b121dd54f71b9d66087879 diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h index 5564296..7ac5246 100644 --- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h +++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h @@ -38,14 +38,14 @@ namespace Internal /** * TextView is a custom control for text aligning and multiline support */ -class TextView : public ControlImpl +class TextView : public Control { public: // Properties enum { - TEXTVIEW_PROPERTY_START_INDEX = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1, + TEXTVIEW_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, TEXTVIEW_PROPERTY_END_INDEX = TEXTVIEW_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices }; @@ -60,6 +60,7 @@ public: SplitOriginal, ///< Split if it exceeds the width but no action if it exceeds the height. SplitFade, ///< Split if it exceeds the width and faded if it exceeds the height. SplitShrink, ///< Split if it exceeds the width and shrunk if it exceeds the height. + SplitEllipsizeEnd, ///< Split if it exceeds the width and ellipsize if it exceeds the height. Fade, ///< Faded if it exceeds any boundary. FadeOriginal, ///< Faded if it exceeds the width but no action if it exceeds the height. ShrinkOriginal, ///< Shrunk if it exceeds the width but no action if it exceeds the height. @@ -359,7 +360,7 @@ public: static Property::Value GetProperty( BaseObject* object, Property::Index index ); -private: // From ControlImpl +private: // From Control /** * @copydoc Toolkit::Control::OnInitialize()