DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent multiple calls to layout without changing paragraph.

Browse Source 
Change-Id: I64e81606f095e3029161f5a01623df4c1ccbf5a9
This commit is contained in:
Gary Qian 2017-06-22 10:22:52 -07:00
parent b5d528f279
commit f17cdae74e
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engine/src/flutter/src/paragraph.cc
View File

@ -112,6 +112,9 @@ Paragraph::Paragraph() = default;
Paragraph::~Paragraph() = default;
void Paragraph::SetText(std::vector<uint16_t> text, StyledRuns runs) {
needs_layout_ = true;
if (text.size() == 0)
return;
text_ = std::move(text);
runs_ = std::move(runs);
@ -138,6 +141,11 @@ void Paragraph::Layout(double width,
const std::string& rootdir,
const double x_offset,
const double y_offset) {
// Do not allow calling layout multiple times without changing anything.
if (!needs_layout_)
return;
needs_layout_ = false;
width_ = width;
breaker_.setLineWidths(0.0f, 0, width);
@ -261,15 +269,15 @@ void Paragraph::Layout(double width,
if (max_line_spacing <
(-metrics.fAscent + metrics.fLeading) * run.style.height) {
max_line_spacing = lines_ == 0 ? -metrics.fAscent * run.style.height
max_line_spacing = lines_ == 0 ? metrics.fCapHeight * run.style.height
: (-metrics.fAscent + metrics.fLeading) *
run.style.height;
// Record the alphabetic_baseline_:
if (lines_ == 0) {
alphabetic_baseline_ = -metrics.fAscent * run.style.height;
alphabetic_baseline_ = metrics.fCapHeight * run.style.height;
// TODO(garyq): Properly implement ideographic_baseline_.
ideographic_baseline_ =
((metrics.fDescent / 2) - metrics.fAscent) * run.style.height;
(metrics.fDescent + metrics.fCapHeight) * run.style.height;
}
}
if (max_descent < metrics.fDescent * run.style.height)
@ -333,12 +341,13 @@ double Paragraph::GetHeight() const {
}
void Paragraph::SetParagraphStyle(const ParagraphStyle& style) {
needs_layout_ = true;
paragraph_style_ = style;
}
void Paragraph::Paint(SkCanvas* canvas, double x, double y) {
SkPaint paint;
for (const auto& record : records_) {
SkPaint paint;
paint.setColor(record.style().color);
SkPoint offset = record.offset();
// TODO(garyq): Fix alignment for paragraphs with multiple styles per line.
@ -362,6 +371,12 @@ void Paragraph::Paint(SkCanvas* canvas, double x, double y) {
PaintDecorations(canvas, x + offset.x(), y + offset.y(), record.style(),
record.metrics(), record.text());
}
paint.setStyle(SkPaint::kFill_Style);
paint.setAntiAlias(true);
paint.setStrokeWidth(4);
paint.setColor(0xffFE938C);
canvas->drawCircle(x, y, 3, paint);
}
void Paragraph::PaintDecorations(SkCanvas* canvas,

1
engine/src/flutter/src/paragraph.h
View File

@ -85,6 +85,7 @@ class Paragraph {
double min_intrinsic_width_ = 0.0f;
double alphabetic_baseline_ = FLT_MAX;
double ideographic_baseline_ = FLT_MAX;
bool needs_layout_ = true;
void SetText(std::vector<uint16_t> text, StyledRuns runs);