mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-30 13:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Take into account specified winding rule in Skia painter

Browse source
This commit is contained in:
Aliaksandr Kalenik 2024-06-19 17:19:17 +03:00 • committed by Andreas Kling
commit 8a509a8023
Notes: sideshowbarker 2024-07-17 06:51:40 +09:00
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Libraries/LibWeb/Painting/CommandExecutorSkia.cpp
View file

@ -102,6 +102,17 @@ static SkPath to_skia_path(Gfx::Path const& path)
return path_builder.snapshot(); return path_builder.snapshot();
} }
static SkPathFillType to_skia_path_fill_type(Gfx::WindingRule winding_rule)
{
switch (winding_rule) {
case Gfx::WindingRule::Nonzero:
return SkPathFillType::kWinding;
case Gfx::WindingRule::EvenOdd:
return SkPathFillType::kEvenOdd;
}
VERIFY_NOT_REACHED();
}
static SkRRect to_skia_rrect(auto const& rect, CornerRadii const& corner_radii) static SkRRect to_skia_rrect(auto const& rect, CornerRadii const& corner_radii)
{ {
SkRRect rrect; SkRRect rrect;
@ -553,6 +564,7 @@ CommandResult CommandExecutorSkia::fill_path_using_color(FillPathUsingColor cons
paint.setAntiAlias(true); paint.setAntiAlias(true);
paint.setColor(to_skia_color(command.color)); paint.setColor(to_skia_color(command.color));
auto path = to_skia_path(command.path); auto path = to_skia_path(command.path);
path.setFillType(to_skia_path_fill_type(command.winding_rule));
path.offset(command.aa_translation.x(), command.aa_translation.y()); path.offset(command.aa_translation.x(), command.aa_translation.y());
canvas.drawPath(path, paint); canvas.drawPath(path, paint);
return CommandResult::Continue; return CommandResult::Continue;
@ -601,6 +613,7 @@ CommandResult CommandExecutorSkia::fill_path_using_paint_style(FillPathUsingPain
{ {
auto path = to_skia_path(command.path); auto path = to_skia_path(command.path);
path.offset(command.aa_translation.x(), command.aa_translation.y()); path.offset(command.aa_translation.x(), command.aa_translation.y());
path.setFillType(to_skia_path_fill_type(command.winding_rule));
auto paint = paint_style_to_skia_paint(*command.paint_style, command.bounding_rect().to_type<float>()); auto paint = paint_style_to_skia_paint(*command.paint_style, command.bounding_rect().to_type<float>());
paint.setAntiAlias(true); paint.setAntiAlias(true);
paint.setAlphaf(command.opacity); paint.setAlphaf(command.opacity);