Rename tightWidth to longestLine (#8706)

Renaming a brand new and unused parameter due to some discussion about connecting with the framework.
This commit is contained in:
Justin McCandless 2019-04-26 16:06:12 -07:00 committed by GitHub
parent 7f753f8f52
commit 3493dcfbae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 26 additions and 26 deletions

View File

@ -1319,7 +1319,7 @@ class Paragraph extends NativeFieldWrapperClass2 {
/// the rightmost glyph in the paragraph.
///
/// Valid only after [layout] has been called.
double get tightWidth native 'Paragraph_tightWidth';
double get longestLine native 'Paragraph_longestLine';
/// The minimum width that this paragraph could be without failing to paint
/// its contents within itself.

View File

@ -22,7 +22,7 @@ IMPLEMENT_WRAPPERTYPEINFO(ui, Paragraph);
#define FOR_EACH_BINDING(V) \
V(Paragraph, width) \
V(Paragraph, height) \
V(Paragraph, tightWidth) \
V(Paragraph, longestLine) \
V(Paragraph, minIntrinsicWidth) \
V(Paragraph, maxIntrinsicWidth) \
V(Paragraph, alphabeticBaseline) \
@ -57,8 +57,8 @@ double Paragraph::height() {
return m_paragraphImpl->height();
}
double Paragraph::tightWidth() {
return m_paragraphImpl->tightWidth();
double Paragraph::longestLine() {
return m_paragraphImpl->longestLine();
}
double Paragraph::minIntrinsicWidth() {

View File

@ -33,7 +33,7 @@ class Paragraph : public RefCountedDartWrappable<Paragraph> {
double width();
double height();
double tightWidth();
double longestLine();
double minIntrinsicWidth();
double maxIntrinsicWidth();
double alphabeticBaseline();

View File

@ -19,7 +19,7 @@ class ParagraphImpl {
virtual double height() = 0;
virtual double tightWidth() = 0;
virtual double longestLine() = 0;
virtual double minIntrinsicWidth() = 0;

View File

@ -29,8 +29,8 @@ double ParagraphImplTxt::height() {
return m_paragraph->GetHeight();
}
double ParagraphImplTxt::tightWidth() {
return m_paragraph->GetTightWidth();
double ParagraphImplTxt::longestLine() {
return m_paragraph->GetLongestLine();
}
double ParagraphImplTxt::minIntrinsicWidth() {

View File

@ -19,7 +19,7 @@ class ParagraphImplTxt : public ParagraphImpl {
double width() override;
double height() override;
double tightWidth() override;
double longestLine() override;
double minIntrinsicWidth() override;
double maxIntrinsicWidth() override;
double alphabeticBaseline() override;

View File

@ -946,7 +946,7 @@ void Paragraph::Layout(double width, bool force) {
return a.code_units.start < b.code_units.start;
});
tight_width_ = max_right_ - min_left_;
longest_line_ = max_right_ - min_left_;
}
double Paragraph::GetLineXOffset(double line_total_advance) {
@ -998,8 +998,8 @@ double Paragraph::GetMaxWidth() const {
return width_;
}
double Paragraph::GetTightWidth() const {
return tight_width_;
double Paragraph::GetLongestLine() const {
return longest_line_;
}
void Paragraph::SetParagraphStyle(const ParagraphStyle& style) {

View File

@ -155,11 +155,11 @@ class Paragraph {
// GetMaxWidth() >= GetLayoutWidth().
double GetMaxWidth() const;
// Returns the tight width found in Layout(), which is defined as the
// horizontal distance from the left edge of the leftmost glyph to the right
// edge of the rightmost glyph. We expect that GetTightWidth() <=
// GetMaxWidth().
double GetTightWidth() const;
// Returns the width of the longest line as found in Layout(), which is
// defined as the horizontal distance from the left edge of the leftmost glyph
// to the right edge of the rightmost glyph. We expect that
// GetLongestLine() <= GetMaxWidth().
double GetLongestLine() const;
// Distance from top of paragraph to the Alphabetic baseline of the first
// line. Used for alphabetic fonts (A-Z, a-z, greek, etc.)
@ -354,7 +354,7 @@ class Paragraph {
// The max width of the paragraph as provided in the most recent Layout()
// call.
double width_ = -1.0f;
double tight_width_ = -1.0f;
double longest_line_ = -1.0f;
double max_intrinsic_width_ = 0;
double min_intrinsic_width_ = 0;
double alphabetic_baseline_ = FLT_MAX;

View File

@ -265,17 +265,17 @@ TEST_F(ParagraphTest, BoldParagraph) {
ASSERT_EQ(paragraph->records_[0].style().color, text_style.color);
ASSERT_TRUE(Snapshot());
// width_ takes the full available space, but tight_width_ is only the width
// width_ takes the full available space, but longest_line_ is only the width
// of the text, which is less than one line.
ASSERT_DOUBLE_EQ(paragraph->width_, GetTestCanvasWidth());
ASSERT_TRUE(paragraph->tight_width_ < paragraph->width_);
ASSERT_TRUE(paragraph->longest_line_ < paragraph->width_);
Paragraph::RectHeightStyle rect_height_style =
Paragraph::RectHeightStyle::kMax;
Paragraph::RectWidthStyle rect_width_style =
Paragraph::RectWidthStyle::kTight;
std::vector<txt::Paragraph::TextBox> boxes = paragraph->GetRectsForRange(
0, strlen(text), rect_height_style, rect_width_style);
ASSERT_DOUBLE_EQ(paragraph->tight_width_,
ASSERT_DOUBLE_EQ(paragraph->longest_line_,
boxes[boxes.size() - 1].rect.right() - boxes[0].rect.left());
}
@ -446,13 +446,13 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(RightAlignParagraph)) {
paragraph->breaker_.getWidths()[paragraph->records_[0].line()],
2.0);
// width_ takes the full available space, while tight_width_ wraps the glyphs
// width_ takes the full available space, while longest_line_ wraps the glyphs
// as tightly as possible. Even though this text is more than one line long,
// no line perfectly spans the width of the full line, so tight_width_ is less
// than width_.
// no line perfectly spans the width of the full line, so longest_line_ is
// less than width_.
ASSERT_DOUBLE_EQ(paragraph->width_, available_width);
ASSERT_TRUE(paragraph->tight_width_ < available_width);
ASSERT_DOUBLE_EQ(paragraph->tight_width_, 880.765625);
ASSERT_TRUE(paragraph->longest_line_ < available_width);
ASSERT_DOUBLE_EQ(paragraph->longest_line_, 880.765625);
ASSERT_TRUE(paragraph->records_[2].style().equals(text_style));
ASSERT_DOUBLE_EQ(paragraph->records_[2].offset().y(), expected_y);