github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-15 01:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix text layer bounds clipping glyph (#11141)

Browse Source
This commit is contained in:
Elena Torró 2026-08-12 07:10:34 +02:00 committed by GitHub
parent 9f17aa6216
commit 868340dfba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
render-wasm/src/shapes.rs
View File

@ -1071,10 +1071,15 @@ impl Shape {
} }
fn own_extrect_bounds(&self) -> Bounds { fn own_extrect_bounds(&self) -> Bounds {
self.expand_own_bounds(self.own_base_bounds())
}
/// The shape's own geometry bounds, before stroke/shadow/blur margins.
fn own_base_bounds(&self) -> Bounds {
let shape = self; let shape = self;
let max_stroke = Stroke::max_bounds_width(shape.strokes.iter(), shape.is_open()); let max_stroke = Stroke::max_bounds_width(shape.strokes.iter(), shape.is_open());
let mut bounds = match &shape.shape_type { match &shape.shape_type {
Type::Path(_) | Type::Bool(_) => { Type::Path(_) | Type::Bool(_) => {
if let Some(path) = shape.get_skia_path() { if let Some(path) = shape.get_skia_path() {
let cap_margin = shape.cap_bounds_margin(); let cap_margin = shape.cap_bounds_margin();
@ -1091,9 +1096,12 @@ impl Shape {
text_content.calculate_bounds(shape, false) text_content.calculate_bounds(shape, false)
} }
_ => shape.calculate_bounds(false), _ => shape.calculate_bounds(false),
}; }
}
bounds = self.apply_stroke_bounds(bounds, max_stroke); fn expand_own_bounds(&self, bounds: Bounds) -> Bounds {
let max_stroke = Stroke::max_bounds_width(self.strokes.iter(), self.is_open());
let mut bounds = self.apply_stroke_bounds(bounds, max_stroke);
bounds = self.apply_shadow_bounds(bounds); bounds = self.apply_shadow_bounds(bounds);
bounds = self.apply_blur_bounds(bounds); bounds = self.apply_blur_bounds(bounds);
bounds bounds
@ -1104,7 +1112,15 @@ impl Shape {
/// first). Includes shadow/blur margins, so it is also a valid input bound /// first). Includes shadow/blur margins, so it is also a valid input bound
/// for a layer whose paint carries an image filter. /// for a layer whose paint carries an image filter.
pub fn layer_bounds(&self) -> math::Rect { pub fn layer_bounds(&self) -> math::Rect {
self.own_extrect_bounds().to_rect() let mut bounds = self.own_base_bounds();
if matches!(self.shape_type, Type::Text(_)) {
let mut rect = bounds.to_rect();
rect.join(self.selrect);
bounds = Bounds::from_rect(&rect);
}
self.expand_own_bounds(bounds).to_rect()
} }
fn calculate_extrect_uncached(&self, shapes_pool: ShapesPoolRef, scale: f32) -> math::Rect { fn calculate_extrect_uncached(&self, shapes_pool: ShapesPoolRef, scale: f32) -> math::Rect {