fix: clip mask checks

Author: wash2

core/src/rectangle.rs

@@ -79,6 +79,16 @@ impl Rectangle<f32> {
             && point.y < self.y + self.height
     }
 
+    /// Returns true if the given [`Point`] is contained in the [`Rectangle`].
+    /// The [`Point`] must be strictly contained, i.e. it must not be on the
+    /// border.
+    pub fn contains_strict(&self, point: Point) -> bool {
+        self.x < point.x
+            && point.x < self.x + self.width
+            && self.y < point.y
+            && point.y < self.y + self.height
+    }
+
     /// Returns true if the current [`Rectangle`] is completely within the given
     /// `container`.
     pub fn is_within(&self, container: &Rectangle) -> bool {
@@ -88,6 +98,16 @@ impl Rectangle<f32> {
             )
     }
 
+    /// Returns true if the current [`Rectangle`] is completely within the given
+    /// `container`. The [`Rectangle`] must be strictly contained, i.e. it must
+    /// not be on the border.
+    pub fn is_within_strict(&self, container: &Rectangle) -> bool {
+        container.contains_strict(self.position())
+            && container.contains_strict(
+                self.position() + Vector::new(self.width, self.height),
+            )
+    }
+
     /// Computes the intersection with the given [`Rectangle`].
     pub fn intersection(
         &self,

src/lib.rs

@@ -151,12 +151,13 @@
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
 )]
-#![forbid(rust_2018_idioms, unsafe_code)]
+#![forbid(unsafe_code)]
 #![deny(
     missing_debug_implementations,
     missing_docs,
-    unused_results,
-    rustdoc::broken_intra_doc_links
+    rust_2018_idioms,
+    rustdoc::broken_intra_doc_links,
+    unused_results
 )]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![cfg_attr(docsrs, feature(doc_cfg))]

tiny_skia/src/backend.rs

@@ -159,8 +159,9 @@ impl Backend {
                     return;
                 }
 
-                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then_some(clip_mask as &_);
+                let clip_mask = (!physical_bounds
+                    .is_within_strict(&clip_bounds))
+                .then_some(clip_mask as &_);
 
                 let transform = tiny_skia::Transform::from_translate(
                     translation.x,
@@ -378,8 +379,9 @@ impl Backend {
                     return;
                 }
 
-                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then_some(clip_mask as &_);
+                let clip_mask = (!physical_bounds
+                    .is_within_strict(&clip_bounds))
+                .then_some(clip_mask as &_);
 
                 self.text_pipeline.draw_paragraph(
                     paragraph,
@@ -403,8 +405,9 @@ impl Backend {
                     return;
                 }
 
-                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then_some(clip_mask as &_);
+                let clip_mask = (!physical_bounds
+                    .is_within_strict(&clip_bounds))
+                .then_some(clip_mask as &_);
 
                 self.text_pipeline.draw_editor(
                     editor,
@@ -434,8 +437,9 @@ impl Backend {
                     return;
                 }
 
-                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then_some(clip_mask as &_);
+                let clip_mask = (!physical_bounds
+                    .is_within_strict(&clip_bounds))
+                .then_some(clip_mask as &_);
 
                 self.text_pipeline.draw_cached(
                     content,
@@ -465,8 +469,9 @@ impl Backend {
                     return;
                 }
 
-                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then_some(clip_mask as &_);
+                let clip_mask = (!physical_bounds
+                    .is_within_strict(&clip_bounds))
+                .then_some(clip_mask as &_);
 
                 let transform = tiny_skia::Transform::from_translate(
                     translation.x,
@@ -502,8 +507,9 @@ impl Backend {
                     return;
                 }
 
-                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then_some(clip_mask as &_);
+                let clip_mask = (!physical_bounds
+                    .is_within_strict(&clip_bounds))
+                .then_some(clip_mask as &_);
 
                 self.vector_pipeline.draw(
                     handle,
@@ -539,8 +545,9 @@ impl Backend {
                     return;
                 }
 
-                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then_some(clip_mask as &_);
+                let clip_mask = (!physical_bounds
+                    .is_within_strict(&clip_bounds))
+                .then_some(clip_mask as &_);
 
                 pixels.fill_path(
                     path,
@@ -572,8 +579,9 @@ impl Backend {
                     return;
                 }
 
-                let clip_mask = (!physical_bounds.is_within(&clip_bounds))
-                    .then_some(clip_mask as &_);
+                let clip_mask = (!physical_bounds
+                    .is_within_strict(&clip_bounds))
+                .then_some(clip_mask as &_);
 
                 pixels.stroke_path(
                     path,