Merge branch 'master' into 0.6

Author: hecrj

CHANGELOG.md

@@ -6,6 +6,39 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.0] - 2022-12-07
+### Added
+- Support for non-uniform border radius for `Primitive::Quad`. [#1506](https://github.com/iced-rs/iced/pull/1506)
+- Operation to query the current focused widget. [#1526](https://github.com/iced-rs/iced/pull/1526)
+- Additional operations for `TextInput`. [#1529](https://github.com/iced-rs/iced/pull/1529)
+- Styling support for `Svg`. [#1578](https://github.com/iced-rs/iced/pull/1578)
+
+### Changed
+- Triangle geometry using a solid color is now drawn in a single draw call. [#1538](https://github.com/iced-rs/iced/pull/1538)
+
+### Fixed
+- Gradients for WebAssembly target. [#1524](https://github.com/iced-rs/iced/pull/1524)
+- `Overlay` layout cache not being invalidated. [#1528](https://github.com/iced-rs/iced/pull/1528)
+- Operations not working for `PaneGrid`. [#1533](https://github.com/iced-rs/iced/pull/1533)
+- Mapped `widget::Operation` always returning `Outcome::None`. [#1536](https://github.com/iced-rs/iced/pull/1536)
+- Padding of `TextInput` with `Length::Units` width. [#1539](https://github.com/iced-rs/iced/pull/1539)
+- Clipping of `Image` and `Svg` widgets in `iced_glow`. [#1557](https://github.com/iced-rs/iced/pull/1557)
+- Invalid links in documentation. [#1560](https://github.com/iced-rs/iced/pull/1560)
+- `Custom` style of `PickList` widget. [#1570](https://github.com/iced-rs/iced/pull/1570)
+- Scroller in `Scrollable` always being drawn. [#1574](https://github.com/iced-rs/iced/pull/1574)
+
+Many thanks to...
+
+- @bungoboingo
+- @l1Dan
+- @mmstick
+- @mtkennerly
+- @PolyMeilex
+- @rksm
+- @rs017991
+- @tarkah
+- @wash2
+
 ## [0.5.0] - 2022-11-10
 ### Added
 - __[Stabilization of stateless widgets][stateless]__ (#1393)  

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iced"
-version = "0.5.2"
+version = "0.6.0"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
 edition = "2021"
 description = "A cross-platform GUI library inspired by Elm"
@@ -55,48 +55,17 @@ members = [
     "style",
     "wgpu",
     "winit",
-    "examples/arc",
-    "examples/bezier_tool",
-    "examples/clock",
-    "examples/color_palette",
-    "examples/component",
-    "examples/counter",
-    "examples/custom_widget",
-    "examples/download_progress",
-    "examples/events",
-    "examples/exit",
-    "examples/game_of_life",
-    "examples/integration_opengl",
-    "examples/integration_wgpu",
-    "examples/lazy",
-    "examples/modern_art",
-    "examples/multitouch",
-    "examples/pane_grid",
-    "examples/pick_list",
-    "examples/pokedex",
-    "examples/progress_bar",
-    "examples/qr_code",
-    "examples/scrollable",
-    "examples/sierpinski_triangle",
-    "examples/solar_system",
-    "examples/stopwatch",
-    "examples/styling",
-    "examples/svg",
-    "examples/system_information",
-    "examples/todos",
-    "examples/tooltip",
-    "examples/tour",
-    "examples/websocket",
+    "examples/*",
 ]
 
 [dependencies]
 iced_core = { version = "0.6", path = "core" }
 iced_futures = { version = "0.5", path = "futures" }
-iced_native = { version = "0.6", path = "native" }
-iced_graphics = { version = "0.4", path = "graphics" }
-iced_winit = { version = "0.5", path = "winit", features = ["application"] }
-iced_glutin = { version = "0.4", path = "glutin", optional = true }
-iced_glow = { version = "0.4", path = "glow", optional = true }
+iced_native = { version = "0.7", path = "native" }
+iced_graphics = { version = "0.5", path = "graphics" }
+iced_winit = { version = "0.6", path = "winit", features = ["application"] }
+iced_glutin = { version = "0.5", path = "glutin", optional = true }
+iced_glow = { version = "0.5", path = "glow", optional = true }
 thiserror = "1.0"
 
 [dependencies.image_rs]
@@ -105,10 +74,10 @@ package = "image"
 optional = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-iced_wgpu = { version = "0.6", path = "wgpu", optional = true }
+iced_wgpu = { version = "0.7", path = "wgpu", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-iced_wgpu = { version = "0.6", path = "wgpu", features = ["webgl"], optional = true }
+iced_wgpu = { version = "0.7", path = "wgpu", features = ["webgl"], optional = true }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]

README.md

@@ -68,7 +68,7 @@ __Iced is currently experimental software.__ [Take a look at the roadmap],
 Add `iced` as a dependency in your `Cargo.toml`:
 
 ```toml
-iced = "0.5"
+iced = "0.6"
 ```
 
 If your project is using a Rust edition older than 2021, then you will need to
@@ -215,7 +215,7 @@ cargo run --features iced/glow --package game_of_life
 and then use it in your project with
 
 ```toml
-iced = { version = "0.5", default-features = false, features = ["glow"] }
+iced = { version = "0.6", default-features = false, features = ["glow"] }
 ```
 
 __NOTE:__ Chances are you have hardware that supports at least OpenGL 2.1 or OpenGL ES 2.0,

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iced_core"
-version = "0.6.1"
+version = "0.6.2"
 authors = ["Héctor Ramón Jiménez <[email protected]>"]
 edition = "2021"
 description = "The essential concepts of Iced"

core/src/color.rs

@@ -89,6 +89,17 @@ impl Color {
         }
     }
 
+    /// Converts the [`Color`] into its RGBA8 equivalent.
+    #[must_use]
+    pub fn into_rgba8(self) -> [u8; 4] {
+        [
+            (self.r * 255.0).round() as u8,
+            (self.g * 255.0).round() as u8,
+            (self.b * 255.0).round() as u8,
+            (self.a * 255.0).round() as u8,
+        ]
+    }
+
     /// Converts the [`Color`] into its linear values.
     pub fn into_linear(self) -> [f32; 4] {
         // As described in:
@@ -148,24 +159,26 @@ impl From<[f32; 4]> for Color {
 #[macro_export]
 macro_rules! color {
     ($r:expr, $g:expr, $b:expr) => {
-        Color::from_rgb8($r, $g, $b)
+        $crate::Color::from_rgb8($r, $g, $b)
     };
     ($r:expr, $g:expr, $b:expr, $a:expr) => {
-        Color::from_rgba8($r, $g, $b, $a)
+        $crate::Color::from_rgba8($r, $g, $b, $a)
     };
     ($hex:expr) => {{
         let hex = $hex as u32;
         let r = (hex & 0xff0000) >> 16;
         let g = (hex & 0xff00) >> 8;
         let b = (hex & 0xff);
-        Color::from_rgb8(r as u8, g as u8, b as u8)
+
+        $crate::Color::from_rgb8(r as u8, g as u8, b as u8)
     }};
     ($hex:expr, $a:expr) => {{
         let hex = $hex as u32;
         let r = (hex & 0xff0000) >> 16;
         let g = (hex & 0xff00) >> 8;
         let b = (hex & 0xff);
-        Color::from_rgba8(r as u8, g as u8, b as u8, $a)
+
+        $crate::Color::from_rgba8(r as u8, g as u8, b as u8, $a)
     }};
 }
 

core/src/lib.rs

@@ -7,7 +7,7 @@
 //! ![The foundations of the Iced ecosystem](https://github.com/iced-rs/iced/blob/0525d76ff94e828b7b21634fa94a747022001c83/docs/graphs/foundations.png?raw=true)
 //!
 //! [Iced]: https://github.com/iced-rs/iced
-//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.5/native
+//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.6/native
 //! [`iced_web`]: https://github.com/iced-rs/iced_web
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"

examples/custom_quad/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "custom_quad"
+version = "0.1.0"
+authors = ["Robert Krahn"]
+edition = "2021"
+publish = false
+
+[dependencies]
+iced = { path = "../.." }
+iced_native = { path = "../../native" }

examples/custom_quad/src/main.rs

@@ -0,0 +1,160 @@
+//! This example showcases a drawing a quad.
+mod quad {
+    use iced_native::layout::{self, Layout};
+    use iced_native::renderer;
+    use iced_native::widget::{self, Widget};
+    use iced_native::{Color, Element, Length, Point, Rectangle, Size};
+
+    pub struct CustomQuad {
+        size: f32,
+        radius: [f32; 4],
+        border_width: f32,
+    }
+
+    impl CustomQuad {
+        pub fn new(size: f32, radius: [f32; 4], border_width: f32) -> Self {
+            Self {
+                size,
+                radius,
+                border_width,
+            }
+        }
+    }
+
+    impl<Message, Renderer> Widget<Message, Renderer> for CustomQuad
+    where
+        Renderer: renderer::Renderer,
+    {
+        fn width(&self) -> Length {
+            Length::Shrink
+        }
+
+        fn height(&self) -> Length {
+            Length::Shrink
+        }
+
+        fn layout(
+            &self,
+            _renderer: &Renderer,
+            _limits: &layout::Limits,
+        ) -> layout::Node {
+            layout::Node::new(Size::new(self.size, self.size))
+        }
+
+        fn draw(
+            &self,
+            _state: &widget::Tree,
+            renderer: &mut Renderer,
+            _theme: &Renderer::Theme,
+            _style: &renderer::Style,
+            layout: Layout<'_>,
+            _cursor_position: Point,
+            _viewport: &Rectangle,
+        ) {
+            renderer.fill_quad(
+                renderer::Quad {
+                    bounds: layout.bounds(),
+                    border_radius: self.radius.into(),
+                    border_width: self.border_width,
+                    border_color: Color::from_rgb(1.0, 0.0, 0.0),
+                },
+                Color::BLACK,
+            );
+        }
+    }
+
+    impl<'a, Message, Renderer> From<CustomQuad> for Element<'a, Message, Renderer>
+    where
+        Renderer: renderer::Renderer,
+    {
+        fn from(circle: CustomQuad) -> Self {
+            Self::new(circle)
+        }
+    }
+}
+
+use iced::widget::{column, container, slider, text};
+use iced::{Alignment, Element, Length, Sandbox, Settings};
+
+pub fn main() -> iced::Result {
+    Example::run(Settings::default())
+}
+
+struct Example {
+    radius: [f32; 4],
+    border_width: f32,
+}
+
+#[derive(Debug, Clone, Copy)]
+#[allow(clippy::enum_variant_names)]
+enum Message {
+    RadiusTopLeftChanged(f32),
+    RadiusTopRightChanged(f32),
+    RadiusBottomRightChanged(f32),
+    RadiusBottomLeftChanged(f32),
+    BorderWidthChanged(f32),
+}
+
+impl Sandbox for Example {
+    type Message = Message;
+
+    fn new() -> Self {
+        Self {
+            radius: [50.0; 4],
+            border_width: 0.0,
+        }
+    }
+
+    fn title(&self) -> String {
+        String::from("Custom widget - Iced")
+    }
+
+    fn update(&mut self, message: Message) {
+        let [tl, tr, br, bl] = self.radius;
+        match message {
+            Message::RadiusTopLeftChanged(radius) => {
+                self.radius = [radius, tr, br, bl];
+            }
+            Message::RadiusTopRightChanged(radius) => {
+                self.radius = [tl, radius, br, bl];
+            }
+            Message::RadiusBottomRightChanged(radius) => {
+                self.radius = [tl, tr, radius, bl];
+            }
+            Message::RadiusBottomLeftChanged(radius) => {
+                self.radius = [tl, tr, br, radius];
+            }
+            Message::BorderWidthChanged(width) => {
+                self.border_width = width;
+            }
+        }
+    }
+
+    fn view(&self) -> Element<Message> {
+        let [tl, tr, br, bl] = self.radius;
+
+        let content = column![
+            quad::CustomQuad::new(200.0, self.radius, self.border_width),
+            text(format!("Radius: {tl:.2}/{tr:.2}/{br:.2}/{bl:.2}")),
+            slider(1.0..=100.0, tl, Message::RadiusTopLeftChanged).step(0.01),
+            slider(1.0..=100.0, tr, Message::RadiusTopRightChanged).step(0.01),
+            slider(1.0..=100.0, br, Message::RadiusBottomRightChanged)
+                .step(0.01),
+            slider(1.0..=100.0, bl, Message::RadiusBottomLeftChanged)
+                .step(0.01),
+            slider(1.0..=10.0, self.border_width, Message::BorderWidthChanged)
+                .step(0.01),
+        ]
+        .padding(20)
+        .spacing(20)
+        .max_width(500)
+        .align_items(Alignment::Center);
+
+        container(content)
+            .width(Length::Fill)
+            .height(Length::Fill)
+            .center_x()
+            .center_y()
+            .into()
+    }
+}

examples/custom_widget/src/main.rs

@@ -61,7 +61,7 @@ mod circle {
             renderer.fill_quad(
                 renderer::Quad {
                     bounds: layout.bounds(),
-                    border_radius: self.radius,
+                    border_radius: self.radius.into(),
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                 },

examples/geometry/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "geometry"
+version = "0.1.0"
+authors = ["Héctor Ramón Jiménez <[email protected]>"]
+edition = "2021"
+publish = false
+
+[dependencies]
+iced = { path = "../.." }
+iced_native = { path = "../../native" }
+iced_graphics = { path = "../../graphics" }