Fixing minor bugs: ellipsis on justified text

Change-Id: Ic0ebf53b221defa5d07ba2832666b322a2629547
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/289020
Reviewed-by: Ben Wagner <[email protected]>
Commit-Queue: Julia Lavrova <[email protected]>

Author: Rusino

modules/skparagraph/src/Run.cpp

@@ -67,6 +67,7 @@ SkScalar Run::calculateWidth(size_t start, size_t end, bool clip) const {
     }
     auto correction = 0.0f;
     if (end > start && !fJustificationShifts.empty()) {
+        // This is not a typo: we are using Point as a pair of SkScalars
         correction = fJustificationShifts[end - 1].fX -
                      fJustificationShifts[start].fY;
     }

modules/skparagraph/src/TextLine.cpp

@@ -666,12 +666,16 @@ void TextLine::iterateThroughClustersInGlyphsOrder(bool reversed,
 
         auto trailed = fMaster->clusters(trailedRange);
         auto trimmed = fMaster->clusters(trimmedRange);
+        bool ignore = false;
         directional_for_each(trailed, reversed != run.leftToRight(), [&](Cluster& cluster) {
+            if (ignore) return;
             bool ghost =  &cluster >= trimmed.end();
             if (!includeGhosts && ghost) {
+                ignore = true;
                 return;
             }
             if (!visitor(&cluster, ghost)) {
+                ignore = true;
                 return;
             }
         });
@@ -876,6 +880,7 @@ bool TextLine::endsWithHardLineBreak() const {
     // TODO: For some reason Flutter imagines a hard line break at the end of the last line.
     //  To be removed...
     return fMaster->cluster(fGhostClusterRange.end - 1).isHardBreak() ||
+           fEllipsis != nullptr ||
            fGhostClusterRange.end == fMaster->clusters().size() - 1;
 }
 

samplecode/SampleParagraph.cpp

@@ -2730,7 +2730,41 @@ class ParagraphView42 : public ParagraphView_Base {
 private:
     typedef Sample INHERITED;
 };
-//
+
+class ParagraphView43 : public ParagraphView_Base {
+protected:
+    SkString name() override { return SkString("Paragraph43"); }
+
+    void onDrawContent(SkCanvas* canvas) override {
+
+        SkString text("World domination is such an ugly phrase - I prefer to call it world optimisation");
+        canvas->drawColor(SK_ColorWHITE);
+
+        auto fontCollection = sk_make_sp<FontCollection>();
+        fontCollection->setDefaultFontManager(SkFontMgr::RefDefault());
+        fontCollection->enableFontFallback();
+
+        ParagraphStyle paragraph_style;
+        paragraph_style.setTextAlign(TextAlign::kJustify);
+        paragraph_style.setEllipsis(u"\u2026");
+        paragraph_style.setMaxLines(2);
+        ParagraphBuilderImpl builder(paragraph_style, fontCollection);
+        TextStyle text_style;
+        text_style.setColor(SK_ColorBLACK);
+        text_style.setFontFamilies({SkString("Roboto")});
+        text_style.setFontSize(40);
+        text_style.setHeightOverride(true);
+        builder.pushStyle(text_style);
+        builder.addText(text.c_str());
+        auto paragraph = builder.Build();
+        paragraph->layout(width() / 4);
+        paragraph->paint(canvas, 0, 0);
+    }
+
+private:
+    typedef Sample INHERITED;
+};
+
 //////////////////////////////////////////////////////////////////////////////
 DEF_SAMPLE(return new ParagraphView1();)
 DEF_SAMPLE(return new ParagraphView2();)
@@ -2772,3 +2806,4 @@ DEF_SAMPLE(return new ParagraphView38();)
 DEF_SAMPLE(return new ParagraphView39();)
 DEF_SAMPLE(return new ParagraphView41();)
 DEF_SAMPLE(return new ParagraphView42();)
+DEF_SAMPLE(return new ParagraphView43();)