From b7b457a575cdd103915994f640c50262ce30a7c5 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 20 Jan 2024 12:11:18 +0100 Subject: Make `shadow` optional in `renderer::Quad` --- graphics/src/damage.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'graphics/src/damage.rs') diff --git a/graphics/src/damage.rs b/graphics/src/damage.rs index 2aec9b25..cced0c97 100644 --- a/graphics/src/damage.rs +++ b/graphics/src/damage.rs @@ -80,26 +80,25 @@ impl Damage for Primitive { } Self::Quad { bounds, - shadow_offset, - shadow_blur_radius, + shadow: Some(shadow), .. } => { let bounds_with_shadow = Rectangle { - x: bounds.x + shadow_offset.x.min(0.0) - shadow_blur_radius, - y: bounds.y + shadow_offset.y.min(0.0) - shadow_blur_radius, + x: bounds.x + shadow.offset.x.min(0.0) - shadow.blur_radius, + y: bounds.y + shadow.offset.y.min(0.0) - shadow.blur_radius, width: bounds.width - + shadow_offset.x.abs() - + shadow_blur_radius * 2.0, + + shadow.offset.x.abs() + + shadow.blur_radius * 2.0, height: bounds.height - + shadow_offset.y.abs() - + shadow_blur_radius * 2.0, + + shadow.offset.y.abs() + + shadow.blur_radius * 2.0, }; bounds_with_shadow.expand(1.0) } - Self::Image { bounds, .. } | Self::Svg { bounds, .. } => { - bounds.expand(1.0) - } + Self::Quad { bounds, .. } + | Self::Image { bounds, .. } + | Self::Svg { bounds, .. } => bounds.expand(1.0), Self::Clip { bounds, .. } => bounds.expand(1.0), Self::Group { primitives } => primitives .iter() -- cgit