Support glow with sctk using updated version of iced_glutin

Cargo.toml

@@ -12,23 +12,27 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
-default = ["wgpu"]
+default = ["dyrend", "winit"]
 # Enables the `Image` widget
-image = ["iced_wgpu?/image", "iced_glow?/image", "image_rs"]
+image = ["iced_wgpu?/image", "iced_glow?/image", "iced_softbuffer?/image", "iced_dyrend?/image", "image_rs"]
 # Enables the `Svg` widget
-svg = ["iced_wgpu?/svg", "iced_glow?/svg"]
+svg = ["iced_wgpu?/svg", "iced_glow?/svg", "iced_softbuffer?/svg", "iced_dyrend?/svg"]
 # Enables the `Canvas` widget
 canvas = ["iced_graphics/canvas"]
 # Enables the `QRCode` widget
 qr_code = ["iced_graphics/qr_code"]
-# Enables the `iced_wgpu` renderer
+# Enables the `iced_dyrend` renderer
+dyrend = ["iced_dyrend"]
+# Enables the `iced_wgpu` renderer. Conflicts with `iced_glow` and `iced_softbuffer`
 wgpu = ["iced_wgpu"]
+# Enables the `iced_softbuffer` renderer. Conflicts with `iced_wgpu` and `iced_glow`
+softbuffer = ["iced_softbuffer"]
+# Enables the `iced_glow` renderer. Conflicts with `iced_wgpu` and `iced_softbuffer`
+glow = ["iced_glow", "iced_glutin"]
 # Enables using system fonts
 default_system_font = ["iced_wgpu?/default_system_font", "iced_glow?/default_system_font"]
-# Enables the `iced_glow` renderer. Overrides `iced_wgpu`
-glow = ["iced_glow", "iced_glutin"]
 # Enables a debug view in native platforms (press F12)
-debug = ["iced_winit/debug"]
+debug = ["iced_winit?/debug"]
 # Enables `tokio` as the `executor::Default` on native platforms
 tokio = ["iced_futures/tokio"]
 # Enables `async-std` as the `executor::Default` on native platforms
@@ -38,34 +42,48 @@ smol = ["iced_futures/smol"]
 # Enables advanced color conversion via `palette`
 palette = ["iced_core/palette"]
 # Enables querying system information
-system = ["iced_winit/system"]
+system = ["iced_winit?/system"]
+# Enables the glutin shell. Conflicts with `sctk` and `winit`.
+# Forces the `glow` renderer, further conflicting with `wgpu` and `softbuffer`.
+glutin = ["iced_glutin", "iced_glow"]
+# Enables the wayland shell. Conflicts with `winit` and `glutin`.
+# Incompatible with the `softbuffer` and `wgpu` renderer.
+wayland = ["iced_sctk"]
+# Enables the winit shell. Conflicts with `wayland` and `glutin`.
+winit = ["iced_winit"]
 
 [badges]
 maintenance = { status = "actively-developed" }
 
 [workspace]
 members = [
     "core",
+    "dyrend",
     "futures",
     "graphics",
     "glow",
     "glutin",
     "lazy",
     "native",
+    "softbuffer",
     "style",
     "wgpu",
     "winit",
+    "sctk",
     "examples/*",
 ]
 
 [dependencies]
 iced_core = { version = "0.6", path = "core" }
+iced_dyrend = { version = "0.1", path = "dyrend", optional = true }
 iced_futures = { version = "0.5", path = "futures" }
 iced_native = { version = "0.7", path = "native" }
 iced_graphics = { version = "0.5", path = "graphics" }
-iced_winit = { version = "0.6", path = "winit", features = ["application"] }
+iced_winit = { version = "0.6", path = "winit", features = ["application"], optional = true }
 iced_glutin = { version = "0.5", path = "glutin", optional = true }
 iced_glow = { version = "0.5", path = "glow", optional = true }
+iced_sctk = { path = "./sctk", optional = true }
+iced_softbuffer = { version = "0.1", path = "softbuffer", optional = true }
 thiserror = "1.0"
 
 [dependencies.image_rs]
@@ -92,3 +110,7 @@ incremental = false
 opt-level = 3
 overflow-checks = false
 strip = "debuginfo"
+
+[patch."https://github.com/iced-rs/winit.git".winit]
+git = "https://github.com/pop-os/winit.git"
+branch = "iced"

core/src/lib.rs

@@ -36,6 +36,7 @@ mod font;
 mod length;
 mod padding;
 mod point;
+mod radius;
 mod rectangle;
 mod size;
 mod vector;
@@ -48,6 +49,7 @@ pub use font::Font;
 pub use length::Length;
 pub use padding::Padding;
 pub use point::Point;
+pub use radius::BorderRadius;
 pub use rectangle::Rectangle;
 pub use size::Size;
 pub use vector::Vector;

core/src/radius.rs

@@ -0,0 +1,22 @@
+/// The border radi for the corners of a graphics primitive in the order:
+/// top-left, top-right, bottom-right, bottom-left.
+#[derive(Debug, Clone, Copy, PartialEq, Default)]
+pub struct BorderRadius([f32; 4]);
+
+impl From<f32> for BorderRadius {
+    fn from(w: f32) -> Self {
+        Self([w; 4])
+    }
+}
+
+impl From<[f32; 4]> for BorderRadius {
+    fn from(radi: [f32; 4]) -> Self {
+        Self(radi)
+    }
+}
+
+impl From<BorderRadius> for [f32; 4] {
+    fn from(radi: BorderRadius) -> Self {
+        radi.0
+    }
+}

dyrend/Cargo.toml

@@ -0,0 +1,52 @@
+[package]
+name = "iced_dyrend"
+version = "0.1.0"
+authors = ["Jeremy Soller <[email protected]>"]
+edition = "2021"
+description = "A dynamicly chosen renderer for Iced"
+license = "MIT AND OFL-1.1"
+repository = "https://github.com/iced-rs/iced"
+
+[dependencies]
+log = "0.4"
+raw-window-handle = "0.5"
+
+[dependencies.iced_native]
+path = "../native"
+
+[dependencies.iced_graphics]
+path = "../graphics"
+features = ["font-fallback", "font-icons"]
+
+[dependencies.iced_glow]
+path = "../glow"
+default-features = false
+optional = true
+
+[dependencies.iced_glutin]
+path = "../glutin"
+default-features = false
+optional = true
+
+
+[dependencies.iced_softbuffer]
+path = "../softbuffer"
+default-features = false
+optional = true
+
+[dependencies.iced_wgpu]
+path = "../wgpu"
+default-features = false
+optional = true
+
+[features]
+default = ["softbuffer"]
+image = ["iced_graphics/image", "iced_glow?/image", "iced_softbuffer?/image", "iced_wgpu?/image"]
+svg = ["iced_graphics/svg", "iced_glow?/svg", "iced_softbuffer?/svg", "iced_wgpu?/svg"]
+glow = ["iced_glow", "iced_glutin"]
+softbuffer = ["iced_softbuffer"]
+wgpu = ["iced_wgpu"]
+
+[package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
+all-features = true

dyrend/README.md

@@ -0,0 +1,3 @@
+# `iced_softbuffer`
+
+Software rendering for Iced

dyrend/src/lib.rs

@@ -0,0 +1,13 @@
+//! A [`softbuffer`] renderer for [`iced_native`].
+#![doc(
+    html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
+)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
+
+mod renderer;
+pub use self::renderer::Renderer;
+
+pub mod settings;
+pub use self::settings::Settings;
+
+pub mod window;