Merge ed5f85e0cdc0dc7a7b8c5e7619d1a641520d9ae4 into e9f1b5825a9d37ca0c173a7b2830ba36a27ca9e0

This commit is contained in:
frozolotl 2025-07-25 00:37:51 +08:00 committed by GitHub
commit 6c1789a433
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -93,7 +93,7 @@ struct State<'a> {
size: Size, size: Size,
} }
impl State<'_> { impl<'a> State<'a> {
fn new(size: Size, transform: sk::Transform, pixel_per_pt: f32) -> Self { fn new(size: Size, transform: sk::Transform, pixel_per_pt: f32) -> Self {
Self { Self {
size, size,
@ -128,9 +128,10 @@ impl State<'_> {
} }
/// Sets the current mask. /// Sets the current mask.
fn with_mask(self, mask: Option<&sk::Mask>) -> State<'_> { ///
// Ensure that we're using the parent's mask if we don't have one. /// If no mask is provided, the parent mask is used.
if mask.is_some() { State { mask, ..self } } else { State { mask: None, ..self } } fn with_mask(self, mask: Option<&'a sk::Mask>) -> State<'a> {
State { mask: mask.or(self.mask), ..self }
} }
/// Sets the size of the first hard frame in the hierarchy. /// Sets the size of the first hard frame in the hierarchy.