language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-17 05:47:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

matching the math for skia and femtovg renders for radial gradient (#7899)

Browse source
This commit is contained in:
szecket 2025-03-21 10:53:04 -04:00 • committed by GitHub
parent 789909f6ea
commit ed47d1e70a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/backends/qt/qt_window.rs
View file

@ -578,7 +578,7 @@ fn into_qbrush(
cpp_class!(unsafe struct QRadialGradient as "QRadialGradient"); cpp_class!(unsafe struct QRadialGradient as "QRadialGradient");
let mut qrg = cpp! { let mut qrg = cpp! {
unsafe [width as "qreal", height as "qreal"] -> QRadialGradient as "QRadialGradient" { unsafe [width as "qreal", height as "qreal"] -> QRadialGradient as "QRadialGradient" {
QRadialGradient qrg(width / 2, height / 2, (width + height) / 4); QRadialGradient qrg(width / 2, height / 2, sqrt(width * width + height * height) / 2);
return qrg; return qrg;
} }
}; };

2
internal/renderers/femtovg/itemrenderer.rs
View file

@ -1564,7 +1564,7 @@ impl<'a> GLItemRenderer<'a> {
path_width / 2., path_width / 2.,
path_height / 2., path_height / 2.,
0., 0.,
(path_width + path_height) / 4., 0.5 * (path_width * path_width + path_height * path_height).sqrt(),
stops, stops,
) )
} }

5
internal/renderers/skia/itemrenderer.rs
View file

@ -121,7 +121,8 @@ impl<'a> SkiaItemRenderer<'a> {
Brush::RadialGradient(g) => { Brush::RadialGradient(g) => {
let (colors, pos): (Vec<_>, Vec<_>) = let (colors, pos): (Vec<_>, Vec<_>) =
g.stops().map(|s| (to_skia_color(&s.color), s.position)).unzip(); g.stops().map(|s| (to_skia_color(&s.color), s.position)).unzip();
let circle_scale = width.max(height) / 2.; let circle_scale =
0.5 * (width.get() * width.get() + height.get() * height.get()).sqrt();
paint.set_dither(true); paint.set_dither(true);
@ -132,7 +133,7 @@ impl<'a> SkiaItemRenderer<'a> {
Some(&*pos), Some(&*pos),
TileMode::Clamp, TileMode::Clamp,
skia_safe::gradient_shader::Flags::INTERPOLATE_COLORS_IN_PREMUL, skia_safe::gradient_shader::Flags::INTERPOLATE_COLORS_IN_PREMUL,
skia_safe::Matrix::scale((circle_scale.get(), circle_scale.get())) skia_safe::Matrix::scale((circle_scale, circle_scale))
.post_translate((width.get() / 2., height.get() / 2.)) .post_translate((width.get() / 2., height.get() / 2.))
as &skia_safe::Matrix, as &skia_safe::Matrix,
) )