Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Changes from all commits
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
25 changes: 17 additions & 8 deletions lib/ui/painting/rrect.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,23 @@ RRect DartConverter<flutter::RRect>::FromDart(Dart_Handle value) {
return result;
}

impeller::RoundingRadii radii = {{buffer[4], buffer[5]},
{buffer[6], buffer[7]},
{buffer[10], buffer[11]},
{buffer[8], buffer[9]}};

result.rrect = flutter::DlRoundRect::MakeRectRadii(
flutter::DlRect::MakeLTRB(buffer[0], buffer[1], buffer[2], buffer[3]),
radii);
// The Flutter rect may be inverted (upside down, backward, or both)
// Historically, Skia would normalize such rects but we will do that
// manually below when we construct the Impeller RoundRect
flutter::DlRect raw_rect =
flutter::DlRect::MakeLTRB(buffer[0], buffer[1], buffer[2], buffer[3]);

// Flutter has radii in TL,TR,BR,BL (clockwise) order,
// but Impeller uses TL,TR,BL,BR (zig-zag) order
impeller::RoundingRadii radii = {
.top_left = flutter::DlSize(buffer[4], buffer[5]),
.top_right = flutter::DlSize(buffer[6], buffer[7]),
.bottom_left = flutter::DlSize(buffer[10], buffer[11]),
.bottom_right = flutter::DlSize(buffer[8], buffer[9]),
};

result.rrect =
flutter::DlRoundRect::MakeRectRadii(raw_rect.GetPositive(), radii);

result.is_null = false;
return result;
Expand Down
Loading