caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-06-08 21:26:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

more fixes to linear gradient

Browse Source
This commit is contained in:
Laurenz Stampfl 2024-12-15 14:27:18 +01:00
parent ca06ae2e6c
commit 67bc4bbf71
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crates/typst-pdf/src/paint.rs
View File

@ -9,7 +9,7 @@ use krilla::page::{NumberingStyle, PageLabel};
use krilla::surface::Surface; use krilla::surface::Surface;
use std::num::NonZeroUsize; use std::num::NonZeroUsize;
use krilla::paint::SpreadMethod; use krilla::paint::SpreadMethod;
use typst_library::layout::{Abs, Angle, AngleUnit, Ratio, Size, Transform}; use typst_library::layout::{Abs, Angle, AngleUnit, Quadrant, Ratio, Size, Transform};
use typst_library::model::Numbering; use typst_library::model::Numbering;
use typst_library::visualize::{Color, ColorSpace, DashPattern, FillRule, FixedStroke, Gradient, Paint, Pattern, RatioOrAngle, RelativeTo, WeightedColor}; use typst_library::visualize::{Color, ColorSpace, DashPattern, FillRule, FixedStroke, Gradient, Paint, Pattern, RatioOrAngle, RelativeTo, WeightedColor};
use typst_utils::Numeric; use typst_utils::Numeric;
@ -226,7 +226,8 @@ fn convert_gradient(
match &gradient { match &gradient {
Gradient::Linear(linear) => { Gradient::Linear(linear) => {
let actual_transform = transforms.transform.invert().unwrap().pre_concat(transform); let actual_transform = transforms.transform.invert().unwrap()
.pre_concat(transform);
if let Some((c, t)) = linear.stops.first() { if let Some((c, t)) = linear.stops.first() {
add_single(c, *t); add_single(c, *t);
@ -254,12 +255,26 @@ fn convert_gradient(
add_single(&second.0, second.1); add_single(&second.0, second.1);
} }
let (mut sin, mut cos) = (angle.sin(), angle.cos());
// Scale to edges of unit square.
let factor = cos.abs() + sin.abs();
sin *= factor;
cos *= factor;
let (x1, y1, x2, y2): (f32, f32, f32, f32) = match angle.quadrant() {
Quadrant::First => (0.0, 0.0, cos as f32, sin as f32),
Quadrant::Second => (1.0, 0.0, cos as f32 + 1.0, sin as f32),
Quadrant::Third => (1.0, 1.0, cos as f32 + 1.0, sin as f32 + 1.0),
Quadrant::Fourth => (0.0, 1.0, cos as f32, sin as f32 + 1.0),
};
let linear = krilla::paint::LinearGradient { let linear = krilla::paint::LinearGradient {
x1: 0.0, x1,
y1: 0.0, y1,
x2: size.x.to_f32(), x2,
y2: 0.0, y2,
transform: actual_transform.as_krilla(), transform: actual_transform.as_krilla().pre_concat(krilla::geom::Transform::from_scale(size.x.to_f32(), size.y.to_f32())),
spread_method: SpreadMethod::Pad, spread_method: SpreadMethod::Pad,
stops: stops.into(), stops: stops.into(),
anti_alias: gradient.anti_alias(), anti_alias: gradient.anti_alias(),