Merge pull request #230 from spamviech/fix-no-wgpu-segfault

Hide fill_quad behind intersects/>0-checks to avoid triggering debug_assert in the tiny_skia-renderer
iced-rs · Apr 8, 2024 · bb7540f · bb7540f
2 parents ca40220 + 2990380
commit bb7540f
Show file tree

Hide file tree

Showing 31 changed files with 722 additions and 645 deletions.
diff --git a/examples/WidgetIDReturn/Cargo.toml b/examples/WidgetIDReturn/Cargo.toml
@@ -11,7 +11,5 @@ iced_aw = { workspace = true, features = [
     "number_input",
     "icons",
 ] }
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace=true
 num-traits = "0.2.16"
diff --git a/examples/badge/Cargo.toml b/examples/badge/Cargo.toml
@@ -12,6 +12,4 @@ iced_aw = { workspace = true, features = [
     "icons",
 ] }
 
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace=true
diff --git a/examples/card/Cargo.toml b/examples/card/Cargo.toml
@@ -10,6 +10,5 @@ edition = "2021"
 iced_aw = { workspace = true, features = [
     "card", "icons"
 ] }
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace=true
+
diff --git a/examples/color_picker/Cargo.toml b/examples/color_picker/Cargo.toml
@@ -10,6 +10,5 @@ edition = "2021"
 iced_aw = { workspace = true, features = [
     "color_picker",
 ] }
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace=true
+
diff --git a/examples/drop_down/Cargo.toml b/examples/drop_down/Cargo.toml
@@ -10,6 +10,4 @@ iced_aw = { workspace = true, features = [
     "drop_down",
     "icons",
 ] }
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace=true
diff --git a/examples/floating_element multioverlay/Cargo.toml b/examples/floating_element multioverlay/Cargo.toml
@@ -11,6 +11,4 @@ iced_aw = { workspace = true, features = [
     "floating_element",
     "icons",
 ] }
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace=true
diff --git a/examples/font_loading/Cargo.toml b/examples/font_loading/Cargo.toml
@@ -7,8 +7,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-iced = { workspace = true, features = [
-    "wgpu",
-] } 
+iced.workspace=true
 iced_aw = { workspace = true, features = [ "icons" ] }
 
diff --git a/examples/menu/Cargo.toml b/examples/menu/Cargo.toml
@@ -10,4 +10,4 @@ iced_aw = { workspace = true, features = [
     "quad",
     "icons"
 ] }
-iced = {workspace = true, features = ["svg", "wgpu"]}
+iced = {workspace = true, features = ["svg"]}
diff --git a/examples/multiple_modals/Cargo.toml b/examples/multiple_modals/Cargo.toml
@@ -8,6 +8,4 @@ edition = "2021"
 
 [dependencies]
 iced_aw = { workspace = true, features = ["card", "modal", "icons"] }
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace = true
diff --git a/examples/multiple_modals/src/main.rs b/examples/multiple_modals/src/main.rs
@@ -8,7 +8,7 @@ fn main() -> iced::Result {
         window: window::Settings {
             size: iced::Size {
                 width: 500.0,
-                height: 150.0,
+                height: 175.0,
             },
             position: window::Position::Centered,
             ..Default::default()

diff --git a/examples/number_input/Cargo.toml b/examples/number_input/Cargo.toml
@@ -12,6 +12,4 @@ iced_aw = { workspace = true, features = [
     "icons",
 ] }
 
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace=true
diff --git a/examples/sliderbar/Cargo.toml b/examples/sliderbar/Cargo.toml
@@ -12,6 +12,5 @@ iced_aw = { workspace = true, features = [
     "icons",
     "number_input",
 ] }
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace=true
+
diff --git a/examples/tab_bar/Cargo.toml b/examples/tab_bar/Cargo.toml
@@ -8,6 +8,4 @@ edition = "2021"
 
 [dependencies]
 iced_aw = { workspace = true, features = ["tab_bar", "icons"] }
-iced = { workspace = true, features = [
-    "wgpu",
-] }
+iced.workspace = true
diff --git a/src/widgets/badge.rs b/src/widgets/badge.rs
@@ -233,18 +233,20 @@ where
             .border_radius
             .unwrap_or(bounds.height / BORDER_RADIUS_RATIO);
 
-        renderer.fill_quad(
-            renderer::Quad {
-                bounds,
-                border: Border {
-                    radius: border_radius.into(),
-                    width: style_sheet.border_width,
-                    color: style_sheet.border_color.unwrap_or(Color::BLACK),
+        if bounds.intersects(viewport) {
+            renderer.fill_quad(
+                renderer::Quad {
+                    bounds,
+                    border: Border {
+                        radius: border_radius.into(),
+                        width: style_sheet.border_width,
+                        color: style_sheet.border_color.unwrap_or(Color::BLACK),
+                    },
+                    shadow: Shadow::default(),
                 },
-                shadow: Shadow::default(),
-            },
-            style_sheet.background,
-        );
+                style_sheet.background,
+            );
+        }
 
         self.content.as_widget().draw(
             &tree.children[0],

diff --git a/src/widgets/card.rs b/src/widgets/card.rs
@@ -502,34 +502,36 @@ where
         let mut children = layout.children();
         let style_sheet = theme.active(&self.style);
 
-        // Background
-        renderer.fill_quad(
-            renderer::Quad {
-                bounds,
-                border: Border {
-                    radius: style_sheet.border_radius.into(),
-                    width: style_sheet.border_width,
-                    color: style_sheet.border_color,
+        if bounds.intersects(viewport) {
+            // Background
+            renderer.fill_quad(
+                renderer::Quad {
+                    bounds,
+                    border: Border {
+                        radius: style_sheet.border_radius.into(),
+                        width: style_sheet.border_width,
+                        color: style_sheet.border_color,
+                    },
+                    shadow: Shadow::default(),
                 },
-                shadow: Shadow::default(),
-            },
-            style_sheet.background,
-        );
-
-        // Border
-        renderer.fill_quad(
-            // TODO: fill not necessary
-            renderer::Quad {
-                bounds,
-                border: Border {
-                    radius: style_sheet.border_radius.into(),
-                    width: style_sheet.border_width,
-                    color: style_sheet.border_color,
+                style_sheet.background,
+            );
+
+            // Border
+            renderer.fill_quad(
+                // TODO: fill not necessary
+                renderer::Quad {
+                    bounds,
+                    border: Border {
+                        radius: style_sheet.border_radius.into(),
+                        width: style_sheet.border_width,
+                        color: style_sheet.border_color,
+                    },
+                    shadow: Shadow::default(),
                 },
-                shadow: Shadow::default(),
-            },
-            Color::TRANSPARENT,
-        );
+                Color::TRANSPARENT,
+            );
+        }
 
         // ----------- Head ----------------------
         let head_layout = children
@@ -758,37 +760,42 @@ fn draw_head<Message, Theme, Renderer>(
     let border_radius = style_sheet.border_radius;
 
     // Head background
-    renderer.fill_quad(
-        renderer::Quad {
-            bounds,
-            border: Border {
-                radius: border_radius.into(),
-                width: 0.0,
-                color: Color::TRANSPARENT,
+    if bounds.intersects(viewport) {
+        renderer.fill_quad(
+            renderer::Quad {
+                bounds,
+                border: Border {
+                    radius: border_radius.into(),
+                    width: 0.0,
+                    color: Color::TRANSPARENT,
+                },
+                shadow: Shadow::default(),
             },
-            shadow: Shadow::default(),
-        },
-        style_sheet.head_background,
-    );
+            style_sheet.head_background,
+        );
+    }
 
     // cover rounded button of header
-    renderer.fill_quad(
-        renderer::Quad {
-            bounds: Rectangle {
-                x: bounds.x,
-                y: bounds.y + bounds.height - border_radius,
-                width: bounds.width,
-                height: border_radius,
-            },
-            border: Border {
-                radius: (0.0).into(),
-                width: 0.0,
-                color: Color::TRANSPARENT,
+    let button_bounds = Rectangle {
+        x: bounds.x,
+        y: bounds.y + bounds.height - border_radius,
+        width: bounds.width,
+        height: border_radius,
+    };
+    if button_bounds.intersects(viewport) {
+        renderer.fill_quad(
+            renderer::Quad {
+                bounds: button_bounds,
+                border: Border {
+                    radius: (0.0).into(),
+                    width: 0.0,
+                    color: Color::TRANSPARENT,
+                },
+                shadow: Shadow::default(),
             },
-            shadow: Shadow::default(),
-        },
-        style_sheet.head_background,
-    );
+            style_sheet.head_background,
+        );
+    }
 
     head.as_widget().draw(
         state,
@@ -846,20 +853,23 @@ fn draw_body<Message, Theme, Renderer>(
 {
     let mut body_children = layout.children();
     let style_sheet = theme.active(style);
+    let bounds = layout.bounds();
 
     // Body background
-    renderer.fill_quad(
-        renderer::Quad {
-            bounds: layout.bounds(),
-            border: Border {
-                radius: (0.0).into(),
-                width: 0.0,
-                color: Color::TRANSPARENT,
+    if bounds.intersects(viewport) {
+        renderer.fill_quad(
+            renderer::Quad {
+                bounds,
+                border: Border {
+                    radius: (0.0).into(),
+                    width: 0.0,
+                    color: Color::TRANSPARENT,
+                },
+                shadow: Shadow::default(),
             },
-            shadow: Shadow::default(),
-        },
-        style_sheet.body_background,
-    );
+            style_sheet.body_background,
+        );
+    }
 
     body.as_widget().draw(
         state,
@@ -893,20 +903,23 @@ fn draw_foot<Message, Theme, Renderer>(
 {
     let mut foot_children = layout.children();
     let style_sheet = theme.active(style);
+    let bounds = layout.bounds();
 
     // Foot background
-    renderer.fill_quad(
-        renderer::Quad {
-            bounds: layout.bounds(),
-            border: Border {
-                radius: style_sheet.border_radius.into(),
-                width: 0.0,
-                color: Color::TRANSPARENT,
+    if bounds.intersects(viewport) {
+        renderer.fill_quad(
+            renderer::Quad {
+                bounds,
+                border: Border {
+                    radius: style_sheet.border_radius.into(),
+                    width: 0.0,
+                    color: Color::TRANSPARENT,
+                },
+                shadow: Shadow::default(),
             },
-            shadow: Shadow::default(),
-        },
-        style_sheet.foot_background,
-    );
+            style_sheet.foot_background,
+        );
+    }
 
     if let Some((foot, state)) = foot.as_ref().zip(state) {
         foot.as_widget().draw(
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ iced_aw = { workspace = true, features = [ @@
         "quad",
         "icons"
     ] }
-    iced = {workspace = true, features = ["svg", "wgpu"]}
+    iced = {workspace = true, features = ["svg"]}