0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibGfx: Add missing return and fix center of radial gradients

Browse source
This commit is contained in:
Lucien Fiorini 2024-12-05 23:48:09 +01:00 • committed by Alexander Kalenik
parent 68894306e2
commit beb621665f
Notes: github-actions[bot] 2024-12-06 19:22:52 +00:00
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibGfx/PainterSkia.cpp
View file

@ -126,7 +126,7 @@ static SkPoint to_skia_point(auto const& point)
return SkPoint::Make(point.x(), point.y()); return SkPoint::Make(point.x(), point.y());
} }
static SkPaint to_skia_paint(Gfx::PaintStyle const& style, Gfx::FloatRect const& bounding_rect) static SkPaint to_skia_paint(Gfx::PaintStyle const& style)
{ {
if (is<Gfx::CanvasLinearGradientPaintStyle>(style)) { if (is<Gfx::CanvasLinearGradientPaintStyle>(style)) {
auto const& linear_gradient = static_cast<Gfx::CanvasLinearGradientPaintStyle const&>(style); auto const& linear_gradient = static_cast<Gfx::CanvasLinearGradientPaintStyle const&>(style);
@ -171,15 +171,13 @@ static SkPaint to_skia_paint(Gfx::PaintStyle const& style, Gfx::FloatRect const&
auto start_radius = radial_gradient.start_radius(); auto start_radius = radial_gradient.start_radius();
auto end_radius = radial_gradient.end_radius(); auto end_radius = radial_gradient.end_radius();
start_center.translate_by(bounding_rect.location());
end_center.translate_by(bounding_rect.location());
auto start_sk_point = to_skia_point(start_center); auto start_sk_point = to_skia_point(start_center);
auto end_sk_point = to_skia_point(end_center); auto end_sk_point = to_skia_point(end_center);
SkMatrix matrix; SkMatrix matrix;
auto shader = SkGradientShader::MakeTwoPointConical(start_sk_point, start_radius, end_sk_point, end_radius, colors.data(), positions.data(), color_stops.size(), SkTileMode::kClamp, 0, &matrix); auto shader = SkGradientShader::MakeTwoPointConical(start_sk_point, start_radius, end_sk_point, end_radius, colors.data(), positions.data(), color_stops.size(), SkTileMode::kClamp, 0, &matrix);
paint.setShader(shader); paint.setShader(shader);
return paint;
} }
return {}; return {};
} }
@ -222,7 +220,7 @@ void PainterSkia::stroke_path(Gfx::Path const& path, Gfx::PaintStyle const& pain
return; return;
auto sk_path = to_skia_path(path); auto sk_path = to_skia_path(path);
auto paint = to_skia_paint(paint_style, path.bounding_box()); auto paint = to_skia_paint(paint_style);
paint.setAntiAlias(true); paint.setAntiAlias(true);
paint.setAlphaf(global_alpha); paint.setAlphaf(global_alpha);
paint.setStyle(SkPaint::Style::kStroke_Style); paint.setStyle(SkPaint::Style::kStroke_Style);
@ -255,7 +253,7 @@ void PainterSkia::fill_path(Gfx::Path const& path, Gfx::PaintStyle const& paint_
{ {
auto sk_path = to_skia_path(path); auto sk_path = to_skia_path(path);
sk_path.setFillType(to_skia_path_fill_type(winding_rule)); sk_path.setFillType(to_skia_path_fill_type(winding_rule));
auto paint = to_skia_paint(paint_style, path.bounding_box()); auto paint = to_skia_paint(paint_style);
paint.setAntiAlias(true); paint.setAntiAlias(true);
paint.setAlphaf(global_alpha); paint.setAlphaf(global_alpha);
impl().canvas()->drawPath(sk_path, paint); impl().canvas()->drawPath(sk_path, paint);