!37 fix UILabel GetTextWidth value error when LineBreakMode is LINE_BREAK_ELLIPSIS

Merge pull request !37 from wangtiantian/master

frameworks/common/text.cpp

@@ -165,6 +165,18 @@ void Text::ReMeasureTextSize(const Rect& textRect, const Style& style)
     }
 }
 
+void Text::ReMeasureTextWidthInEllipsisMode(const Rect& textRect, const Style& style, uint16_t ellipsisIndex)
+{
+    if (ellipsisIndex != TEXT_ELLIPSIS_END_INV) {
+        int16_t lineMaxWidth  = expandWidth_ ? textSize_.x : textRect.GetWidth();
+        uint32_t maxLineBytes = 0;
+        uint16_t lineCount = GetLine(lineMaxWidth, style.letterSpace_, ellipsisIndex, maxLineBytes);
+        if ((lineCount > 0) && (textSize_.x < textLine_[lineCount - 1].linePixelWidth)) {
+            textSize_.x = textLine_[lineCount - 1].linePixelWidth;
+        }
+    }
+}
+
 void Text::OnDraw(const Rect& invalidatedArea,
                   const Rect& viewOrigRect,
                   const Rect& textRect,
@@ -365,4 +377,4 @@ uint16_t Text::GetLetterIndexByPosition(const Rect& textRect, const Style& style
         return static_cast<uint16_t>(i);
     }
 }
-} // namespace OHOS
\ No newline at end of file
+} // namespace OHOS

frameworks/components/ui_label.cpp

@@ -231,9 +231,7 @@ uint16_t UILabel::GetTextWidth()
 {
     InitLabelText();
     if (labelText_->IsNeedRefresh()) {
-        Style style = GetStyleConst();
-        style.textColor_ = GetTextColor();
-        labelText_->ReMeasureTextSize(GetContentRect(), style);
+        ReMeasure();
     }
     return labelText_->GetTextSize().x;
 }
@@ -242,9 +240,7 @@ uint16_t UILabel::GetTextHeight()
 {
     InitLabelText();
     if (labelText_->IsNeedRefresh()) {
-        Style style = GetStyleConst();
-        style.textColor_ = GetTextColor();
-        labelText_->ReMeasureTextSize(GetContentRect(), style);
+        ReMeasure();
     }
     return labelText_->GetTextSize().y;
 }
@@ -297,6 +293,7 @@ void UILabel::ReMeasure()
             break;
         case LINE_BREAK_ELLIPSIS:
             ellipsisIndex_ = labelText_->GetEllipsisIndex(GetContentRect(), style);
+            labelText_->ReMeasureTextWidthInEllipsisMode(GetContentRect(), style, ellipsisIndex_);
             break;
         case LINE_BREAK_MARQUEE:
             RemeasureForMarquee(textSize.x);

interfaces/kits/common/text.h

@@ -245,6 +245,8 @@ public:
 
     virtual void ReMeasureTextSize(const Rect& textRect, const Style& style);
 
+    void ReMeasureTextWidthInEllipsisMode(const Rect& textRect, const Style& style, uint16_t ellipsisIndex);
+
     void OnDraw(const Rect& invalidatedArea,
                 const Rect& viewOrigRect,
                 const Rect& textRect,