// If the exceed policy is ellipsize at the end, negative offsets are not wanted.
// In that case, it will align the line to the left and/or top, and ellipsize the end.
- const bool ellipsizeAlignToLeft = ( layoutParameters.mExceedPolicy == TextView::EllipsizeEndOriginal ) || ( layoutParameters.mExceedPolicy == TextView::EllipsizeEnd );
- const bool ellipsizeAlignToTop = ( layoutParameters.mExceedPolicy == TextView::EllipsizeEnd );
+ const bool ellipsizeAlignToLeft = ( layoutParameters.mExceedPolicy == TextView::EllipsizeEndOriginal ) ||
+ ( layoutParameters.mExceedPolicy == TextView::EllipsizeEnd ) ||
+ ( layoutParameters.mExceedPolicy == TextView::SplitEllipsizeEnd );
+ const bool ellipsizeAlignToTop = ( layoutParameters.mExceedPolicy == TextView::EllipsizeEnd ) ||
+ ( layoutParameters.mExceedPolicy == TextView::SplitEllipsizeEnd );
RelayoutParameters relayoutParameters;
break;
}
+ case TextView::SplitEllipsizeEnd:
case TextView::EllipsizeEnd:
{
// Ellipsizes the text if it doesn't fit in the width and fully fits in the text-view's height.
}
else
{
- if( TextView::EllipsizeEnd == layoutParameters.mExceedPolicy )
+ if( ( TextView::EllipsizeEnd == layoutParameters.mExceedPolicy ) ||
+ ( TextView::SplitEllipsizeEnd == layoutParameters.mExceedPolicy ))
{
if( !ellipsizeParameters.mIsLineHeightFullyVisible )
{
// If the next line exceeds the text-view height then it's going to be invisible and current line needs to be ellipsized.
ellipsizeParameters.mIsLineHeightFullyVisible = true;
ellipsizeParameters.mIsNextLineFullyVisibleHeight = true;
- if( TextView::EllipsizeEnd == layoutParameters.mExceedPolicy )
+ if( ( TextView::EllipsizeEnd == layoutParameters.mExceedPolicy ) ||
+ ( TextView::SplitEllipsizeEnd == layoutParameters.mExceedPolicy ) )
{
// Need to check if there is lines which doesn't fit in the height.
break;
}
case TextView::EllipsizeEndOriginal:
+ case TextView::SplitEllipsizeEnd:
case TextView::EllipsizeEnd: // Fall through
{
// Set first all characters to visible as UpdateVisibilityForEllipsize() doesn't traverse all of them.