mirror
/
typst
mirror of https://github.com/stelzo/typst.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clamp shape radii

This commit is contained in:
Laurenz 2022-12-30 10:07:46 +01:00
parent 94cf7005e9
commit fe1f440069
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/geom/rounded.rs
View File

@ -52,6 +52,7 @@ fn stroke_segments(
let mut connection = Connection::default(); let mut connection = Connection::default();
let mut path = Path::new(); let mut path = Path::new();
let mut always_continuous = true; let mut always_continuous = true;
let max_radius = size.x.min(size.y) / 2.0;
for side in [Side::Top, Side::Right, Side::Bottom, Side::Left] { for side in [Side::Top, Side::Right, Side::Bottom, Side::Left] {
let continuous = stroke.get(side) == stroke.get(side.next_cw()); let continuous = stroke.get(side) == stroke.get(side.next_cw());
@ -62,8 +63,8 @@ fn stroke_segments(
&mut path, &mut path,
side, side,
size, size,
radius.get(side.start_corner()), radius.get(side.start_corner()).clamp(Abs::zero(), max_radius),
radius.get(side.end_corner()), radius.get(side.end_corner()).clamp(Abs::zero(), max_radius),
connection, connection,
); );

BIN
tests/ref/visualize/shape-rounded.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 769 B

6
tests/typ/visualize/shape-rounded.typ Normal file
View File

@ -0,0 +1,6 @@
// Test rounded rectangles and squares.
---
// Ensure that radius is clamped.
#rect(radius: -20pt)
#square(radius: 30pt)