Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' of github.com:flutter/engine into stroked_text_12…
…31322
  • Loading branch information
jonahwilliams committed Jul 10, 2023
commit a47bdc07e72d3b8f1e296631eb68e7b34ee091be
5 changes: 3 additions & 2 deletions impeller/display_list/dl_dispatcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1104,8 +1104,8 @@ void DlDispatcher::drawDisplayList(
void DlDispatcher::drawTextBlob(const sk_sp<SkTextBlob> blob,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's strictly necessary, but adding a playground test in display_list_unittests.cc would be nice as a jumping off point for debugging in the future.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, will do.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

SkScalar x,
SkScalar y) {
Scalar scale = canvas_.GetCurrentTransformation().GetMaxBasisLength();
auto text_frame = TextFrameFromTextBlob(blob, scale);
Scalar scale = canvas_.GetCurrentTransformation().GetMaxBasisLengthXY();
const auto text_frame = TextFrameFromTextBlob(blob, scale);
if (paint_.style == Paint::Style::kStroke) {
auto path = PathDataFromTextBlob(blob);
auto bounds = text_frame.GetBounds();
Expand All @@ -1119,6 +1119,7 @@ void DlDispatcher::drawTextBlob(const sk_sp<SkTextBlob> blob,
return;
}

Scalar scale = canvas_.GetCurrentTransformation().GetMaxBasisLengthXY();
canvas_.DrawTextFrame(text_frame, //
impeller::Point{x, y}, //
paint_ //
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.