From b3ce0f23a59a336308365b9f0dd883d011005c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 15 Jul 2025 05:28:33 +0200
Subject: [PATCH 01/43] Draft `table` widget

---
 Cargo.lock                 |   7 +
 examples/table/Cargo.toml  |  10 +
 examples/table/src/main.rs | 155 ++++++++++
 widget/src/helpers.rs      |   2 +
 widget/src/lib.rs          |   1 +
 widget/src/table.rs        | 563 +++++++++++++++++++++++++++++++++++++
 6 files changed, 738 insertions(+)
 create mode 100644 examples/table/Cargo.toml
 create mode 100644 examples/table/src/main.rs
 create mode 100644 widget/src/table.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3f517be1..88e4ef2b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5633,6 +5633,13 @@ dependencies = [
  "iced",
 ]
 
+[[package]]
+name = "table"
+version = "0.1.0"
+dependencies = [
+ "iced",
+]
+
 [[package]]
 name = "target-lexicon"
 version = "0.12.16"
diff --git a/examples/table/Cargo.toml b/examples/table/Cargo.toml
new file mode 100644
index 00000000..339c2891
--- /dev/null
+++ b/examples/table/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "table"
+version = "0.1.0"
+authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
+edition = "2024"
+publish = false
+
+[dependencies]
+iced.workspace = true
+iced.features = ["debug"]
diff --git a/examples/table/src/main.rs b/examples/table/src/main.rs
new file mode 100644
index 00000000..c05208f9
--- /dev/null
+++ b/examples/table/src/main.rs
@@ -0,0 +1,155 @@
+use iced::font;
+use iced::time::{Duration, hours, minutes};
+use iced::widget::{center, scrollable, table, text};
+use iced::{Element, Fill, Font};
+
+pub fn main() -> iced::Result {
+    iced::application(Table::new, Table::update, Table::view).run()
+}
+
+struct Table {
+    events: Vec<Event>,
+}
+
+#[derive(Debug, Clone)]
+enum Message {}
+
+impl Table {
+    fn new() -> Self {
+        Self {
+            events: Event::list(),
+        }
+    }
+
+    fn update(&mut self, message: Message) {
+        match message {}
+    }
+
+    fn view(&self) -> Element<'_, Message> {
+        let table = {
+            let bold = |header| {
+                text(header).font(Font {
+                    weight: font::Weight::Bold,
+                    ..Font::DEFAULT
+                })
+            };
+
+            let columns = table::definition()
+                .column(bold("Name"), |event: &Event| {
+                    text(&event.name).width(Fill)
+                })
+                .column(bold("Time"), |event| text!("{:?}", event.duration))
+                .column(bold("Price"), |event| text!("{:.2}", event.price))
+                .column(bold("Rating"), |event| text!("{:.2}", event.rating));
+
+            table(columns, &self.events).width(640).spacing_y(5)
+        };
+
+        center(scrollable(table).spacing(10)).padding(10).into()
+    }
+}
+
+struct Event {
+    name: String,
+    duration: Duration,
+    price: f32,
+    rating: f32,
+}
+
+impl Event {
+    fn list() -> Vec<Self> {
+        vec![
+            Event {
+                name: "Get lost in a hacker bookstore".to_owned(),
+                duration: hours(2),
+                price: 0.0,
+                rating: 4.9,
+            },
+            Event {
+                name: "Buy vintage synth at Noisebridge flea market".to_owned(),
+                duration: hours(1),
+                price: 150.0,
+                rating: 4.8,
+            },
+            Event {
+                name: "Eat a questionable hot dog at 2AM".to_owned(),
+                duration: minutes(20),
+                price: 5.0,
+                rating: 1.7,
+            },
+            Event {
+                name: "Ride the MUNI for the story".to_owned(),
+                duration: minutes(60),
+                price: 3.0,
+                rating: 4.1,
+            },
+            Event {
+                name: "Scream into the void from Twin Peaks".to_owned(),
+                duration: minutes(40),
+                price: 0.0,
+                rating: 4.9,
+            },
+            Event {
+                name: "Buy overpriced coffee and feel things".to_owned(),
+                duration: minutes(25),
+                price: 6.5,
+                rating: 4.5,
+            },
+            Event {
+                name: "Attend an underground robot poetry slam".to_owned(),
+                duration: hours(1),
+                price: 12.0,
+                rating: 4.8,
+            },
+            Event {
+                name: "Browse cursed tech at a retro computer fair".to_owned(),
+                duration: hours(2),
+                price: 10.0,
+                rating: 4.7,
+            },
+            Event {
+                name: "Try to order at a secret ramen place with no sign"
+                    .to_owned(),
+                duration: minutes(50),
+                price: 14.0,
+                rating: 4.6,
+            },
+            Event {
+                name: "Join a spontaneous rooftop drone rave".to_owned(),
+                duration: hours(3),
+                price: 0.0,
+                rating: 4.9,
+            },
+            Event {
+                name: "Sketch a stranger at Dolores Park".to_owned(),
+                duration: minutes(45),
+                price: 0.0,
+                rating: 4.4,
+            },
+            Event {
+                name: "Visit the Museum of Obsolete APIs".to_owned(),
+                duration: hours(1),
+                price: 9.99,
+                rating: 4.2,
+            },
+            Event {
+                name: "Chase the last working payphone".to_owned(),
+                duration: minutes(35),
+                price: 0.25,
+                rating: 4.0,
+            },
+            Event {
+                name: "Trade zines with a punk on BART".to_owned(),
+                duration: minutes(30),
+                price: 3.5,
+                rating: 4.7,
+            },
+            Event {
+                name: "Get a tattoo of the Git logo".to_owned(),
+                duration: hours(1),
+                price: 200.0,
+                rating: 4.6,
+            },
+        ]
+    }
+}
diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 5e7b30d7..232cecd8 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -30,6 +30,8 @@ use crate::{Column, Grid, MouseArea, Pin, Pop, Row, Space, Stack, Themer};
 use std::borrow::Borrow;
 use std::ops::RangeInclusive;
 
+pub use crate::table::table;
+
 /// Creates a [`Column`] with the given children.
 ///
 /// Columns distribute their children vertically.
diff --git a/widget/src/lib.rs b/widget/src/lib.rs
index f39f081a..7c144ce2 100644
--- a/widget/src/lib.rs
+++ b/widget/src/lib.rs
@@ -33,6 +33,7 @@ pub mod row;
 pub mod rule;
 pub mod scrollable;
 pub mod slider;
+pub mod table;
 pub mod text;
 pub mod text_editor;
 pub mod text_input;
diff --git a/widget/src/table.rs b/widget/src/table.rs
new file mode 100644
index 00000000..8e1853ca
--- /dev/null
+++ b/widget/src/table.rs
@@ -0,0 +1,563 @@
+#![allow(missing_docs, missing_debug_implementations)]
+use crate::core;
+use crate::core::layout;
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::widget;
+use crate::core::{
+    Background, Element, Layout, Length, Pixels, Rectangle, Size, Widget,
+};
+
+pub fn table<'a, R, T, Message, Theme, Renderer>(
+    columns: impl IntoIterator<Item = Column<'a, T, Message, Theme, Renderer>>,
+    rows: R,
+) -> Table<'a, Message, Theme, Renderer>
+where
+    R: IntoIterator<Item = T>,
+    R::IntoIter: Clone,
+    Theme: Catalog,
+    Renderer: core::Renderer,
+{
+    Table::new(columns, rows)
+}
+
+pub fn definition<'a, T, Message, Theme, Renderer>()
+-> Definition<'a, T, Message, Theme, Renderer> {
+    Definition {
+        columns: Vec::new(),
+    }
+}
+
+pub fn column<'a, T, E, Message, Theme, Renderer>(
+    header: impl Into<Element<'a, Message, Theme, Renderer>>,
+    view: impl Fn(T) -> E + 'a,
+) -> Column<'a, T, Message, Theme, Renderer>
+where
+    T: 'a,
+    E: Into<Element<'a, Message, Theme, Renderer>>,
+{
+    Column {
+        header: header.into(),
+        view: Box::new(move |data| view(data).into()),
+        width: Length::Shrink,
+    }
+}
+
+pub struct Table<'a, Message, Theme = crate::Theme, Renderer = crate::Renderer>
+where
+    Theme: Catalog,
+{
+    columns: Vec<Length>,
+    cells: Vec<Element<'a, Message, Theme, Renderer>>,
+    width: Length,
+    height: Length,
+    spacing_x: f32,
+    spacing_y: f32,
+    separator_x: f32,
+    separator_y: f32,
+    class: Theme::Class<'a>,
+}
+
+impl<'a, Message, Theme, Renderer> Table<'a, Message, Theme, Renderer>
+where
+    Theme: Catalog,
+    Renderer: core::Renderer,
+{
+    pub fn new<R, T>(
+        columns: impl IntoIterator<Item = Column<'a, T, Message, Theme, Renderer>>,
+        rows: R,
+    ) -> Self
+    where
+        R: IntoIterator<Item = T>,
+        R::IntoIter: Clone,
+    {
+        let columns = columns.into_iter();
+        let rows = rows.into_iter();
+
+        let mut width = Length::Shrink;
+        let mut height = Length::Shrink;
+        let mut cells = Vec::with_capacity(
+            columns.size_hint().0 * (1 + rows.size_hint().0),
+        );
+
+        Self {
+            columns: columns
+                .into_iter()
+                .map(|column| {
+                    let mut column_width = column.width;
+
+                    cells.push(column.header);
+                    cells.extend(rows.clone().map(|row| {
+                        let cell = (column.view)(row);
+                        let size_hint = cell.as_widget().size_hint();
+
+                        column_width = column_width.enclose(size_hint.width);
+                        height = height.enclose(size_hint.height);
+
+                        cell
+                    }));
+
+                    width = width.enclose(column_width);
+
+                    column_width
+                })
+                .collect(),
+            cells,
+            width,
+            height,
+            spacing_x: 10.0,
+            spacing_y: 10.0,
+            separator_x: 1.0,
+            separator_y: 1.0,
+            class: Theme::default(),
+        }
+    }
+
+    pub fn width(mut self, width: impl Into<Length>) -> Self {
+        self.width = width.into();
+        self
+    }
+
+    pub fn spacing(self, spacing: impl Into<Pixels>) -> Self {
+        let spacing = spacing.into();
+
+        self.spacing_x(spacing).spacing_y(spacing)
+    }
+
+    pub fn spacing_x(mut self, spacing: impl Into<Pixels>) -> Self {
+        self.spacing_x = spacing.into().0;
+        self
+    }
+
+    pub fn spacing_y(mut self, spacing: impl Into<Pixels>) -> Self {
+        self.spacing_y = spacing.into().0;
+        self
+    }
+}
+
+pub struct Metrics {
+    column_widths: Vec<f32>,
+    row_heights: Vec<f32>,
+}
+
+impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
+    for Table<'a, Message, Theme, Renderer>
+where
+    Theme: Catalog,
+    Renderer: core::Renderer,
+{
+    fn size(&self) -> Size<Length> {
+        Size {
+            width: self.width,
+            height: self.height,
+        }
+    }
+
+    fn tag(&self) -> widget::tree::Tag {
+        widget::tree::Tag::of::<Metrics>()
+    }
+
+    fn state(&self) -> widget::tree::State {
+        widget::tree::State::new(Metrics {
+            column_widths: Vec::new(),
+            row_heights: Vec::new(),
+        })
+    }
+
+    fn children(&self) -> Vec<widget::Tree> {
+        self.cells
+            .iter()
+            .map(|cell| widget::Tree::new(cell.as_widget()))
+            .collect()
+    }
+
+    fn diff(&self, state: &mut widget::Tree) {
+        state.diff_children(&self.cells);
+    }
+
+    fn layout(
+        &self,
+        tree: &mut widget::Tree,
+        renderer: &Renderer,
+        limits: &layout::Limits,
+    ) -> layout::Node {
+        let metrics = tree.state.downcast_mut::<Metrics>();
+        let limits = limits.width(self.width).height(self.height);
+        let rows = self.cells.len() / self.columns.len();
+        let available = limits.max();
+
+        let mut cells = Vec::with_capacity(self.cells.len());
+        cells.resize(self.cells.len(), layout::Node::default());
+
+        metrics.column_widths = vec![0.0; self.columns.len()];
+        metrics.row_heights = vec![0.0; rows];
+
+        let mut column_factors = vec![0; self.columns.len()];
+        let mut row_factors = vec![0; rows];
+
+        let spacing_x = self.spacing_x * 2.0 + self.separator_x;
+        let spacing_y = self.spacing_y * 2.0 + self.separator_y;
+
+        // FIRST PASS
+        // Lay out non-fluid cells
+        let mut x = self.spacing_x;
+        let mut y = self.spacing_y;
+
+        for (i, (cell, state)) in
+            self.cells.iter().zip(&mut tree.children).enumerate()
+        {
+            let column = i / rows;
+            let row = i % rows;
+            let size = cell.as_widget().size();
+
+            if size.width.fill_factor() != 0 || size.height.fill_factor() != 0 {
+                column_factors[column] =
+                    column_factors[column].max(size.width.fill_factor());
+
+                row_factors[row] =
+                    row_factors[row].max(size.height.fill_factor());
+
+                continue;
+            }
+
+            let limits = layout::Limits::new(
+                Size::ZERO,
+                Size::new(available.width - x, available.height - y),
+            )
+            .width(self.columns[i / rows]);
+
+            let layout = cell.as_widget().layout(state, renderer, &limits);
+            let size = layout.size();
+
+            metrics.column_widths[column] =
+                metrics.column_widths[column].max(size.width);
+            metrics.row_heights[row] =
+                metrics.row_heights[row].max(size.height);
+            cells[i] = layout;
+
+            if row == 0 {
+                y = self.spacing_y;
+
+                if column > 0 {
+                    x += metrics.column_widths[column - 1] + spacing_x;
+                }
+            } else {
+                y += size.height + spacing_y;
+            }
+        }
+
+        // SECOND PASS
+        // Lay out fluid cells, using metrics from the first pass as limits
+        let left = Size::new(
+            available.width
+                - metrics
+                    .column_widths
+                    .iter()
+                    .enumerate()
+                    .filter(|(i, _)| column_factors[*i] == 0)
+                    .map(|(_, width)| width)
+                    .sum::<f32>(),
+            available.height
+                - metrics
+                    .row_heights
+                    .iter()
+                    .enumerate()
+                    .filter(|(i, _)| row_factors[*i] == 0)
+                    .map(|(_, height)| height)
+                    .sum::<f32>(),
+        );
+
+        let width_unit = (left.width
+            - spacing_x * self.columns.len().saturating_sub(1) as f32
+            - self.spacing_x * 2.0)
+            / column_factors.iter().sum::<u16>() as f32;
+
+        let height_unit = (left.height
+            - spacing_y * rows.saturating_sub(1) as f32
+            - self.spacing_y * 2.0)
+            / row_factors.iter().sum::<u16>() as f32;
+
+        let mut x = self.spacing_x;
+        let mut y = self.spacing_y;
+
+        for (i, (cell, state)) in
+            self.cells.iter().zip(&mut tree.children).enumerate()
+        {
+            let column = i / rows;
+            let row = i % rows;
+            let size = cell.as_widget().size();
+
+            if size.width.fill_factor() != 0 || size.height.fill_factor() != 0 {
+                let column_factor = column_factors[column];
+                let row_factor = row_factors[row];
+
+                let max_width = if column_factor == 0 {
+                    (available.width - x).max(0.0)
+                } else {
+                    width_unit * column_factor as f32
+                };
+
+                let max_height = if row_factor == 0 {
+                    (available.height - y).max(0.0)
+                } else {
+                    height_unit * row_factor as f32
+                };
+
+                let limits = layout::Limits::new(
+                    Size::ZERO,
+                    Size::new(max_width, max_height),
+                )
+                .width(self.columns[i / rows]);
+
+                let layout = cell.as_widget().layout(state, renderer, &limits);
+                let size = layout.size();
+
+                metrics.column_widths[column] =
+                    metrics.column_widths[column].max(size.width);
+                metrics.row_heights[row] =
+                    metrics.row_heights[row].max(size.height);
+                cells[i] = layout;
+            }
+
+            if row == 0 {
+                y = self.spacing_y;
+
+                if column > 0 {
+                    x += metrics.column_widths[column - 1] + spacing_x;
+                }
+            } else {
+                y += cells[i].size().height + spacing_y;
+            }
+        }
+
+        // THIRD PASS
+        // Position each cell
+        let mut x = self.spacing_x;
+        let mut y = self.spacing_y;
+
+        for (i, cell) in cells.iter_mut().enumerate() {
+            let column = i / rows;
+            let row = i % rows;
+
+            if row == 0 {
+                y = self.spacing_y;
+
+                if column > 0 {
+                    x += metrics.column_widths[column - 1] + spacing_x;
+                }
+            }
+
+            cell.move_to_mut((x, y));
+
+            y += metrics.row_heights[row] + spacing_y;
+        }
+
+        let intrinsic = limits.resolve(
+            self.width,
+            self.height,
+            Size::new(
+                x + metrics
+                    .column_widths
+                    .last()
+                    .copied()
+                    .map(|width| width + self.spacing_x)
+                    .unwrap_or_default(),
+                y - spacing_y + self.spacing_y,
+            ),
+        );
+
+        layout::Node::with_children(intrinsic, cells)
+    }
+
+    fn draw(
+        &self,
+        tree: &widget::Tree,
+        renderer: &mut Renderer,
+        theme: &Theme,
+        style: &renderer::Style,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+        viewport: &Rectangle,
+    ) {
+        for ((cell, state), layout) in
+            self.cells.iter().zip(&tree.children).zip(layout.children())
+        {
+            cell.as_widget()
+                .draw(state, renderer, theme, style, layout, cursor, viewport);
+        }
+
+        let bounds = layout.bounds();
+        let metrics = tree.state.downcast_ref::<Metrics>();
+        let style = theme.style(&self.class);
+
+        if self.separator_x > 0.0 {
+            let mut x = self.spacing_x;
+
+            for width in &metrics.column_widths
+                [..metrics.column_widths.len().saturating_sub(1)]
+            {
+                x += width + self.spacing_x;
+
+                renderer.fill_quad(
+                    renderer::Quad {
+                        bounds: Rectangle {
+                            x: bounds.x + x,
+                            y: bounds.y,
+                            width: self.separator_x,
+                            height: bounds.height,
+                        },
+                        snap: true,
+                        ..renderer::Quad::default()
+                    },
+                    style.separator_x,
+                );
+
+                x += self.separator_x + self.spacing_x;
+            }
+        }
+
+        if self.separator_y > 0.0 {
+            let mut y = self.spacing_y;
+
+            for height in &metrics.row_heights
+                [..metrics.row_heights.len().saturating_sub(1)]
+            {
+                y += height + self.spacing_y;
+
+                renderer.fill_quad(
+                    renderer::Quad {
+                        bounds: Rectangle {
+                            x: bounds.x,
+                            y: bounds.y + y,
+                            width: bounds.width,
+                            height: self.separator_y,
+                        },
+                        snap: true,
+                        ..renderer::Quad::default()
+                    },
+                    style.separator_y,
+                );
+
+                y += self.separator_y + self.spacing_y;
+            }
+        }
+    }
+}
+
+impl<'a, Message, Theme, Renderer> From<Table<'a, Message, Theme, Renderer>>
+    for Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::Renderer + 'a,
+{
+    fn from(table: Table<'a, Message, Theme, Renderer>) -> Self {
+        Element::new(table)
+    }
+}
+
+pub struct Definition<
+    'a,
+    T,
+    Message,
+    Theme = crate::Theme,
+    Renderer = crate::Renderer,
+> {
+    columns: Vec<Column<'a, T, Message, Theme, Renderer>>,
+}
+
+impl<'a, T, Message, Theme, Renderer>
+    Definition<'a, T, Message, Theme, Renderer>
+{
+    pub fn column<E>(
+        mut self,
+        header: impl Into<Element<'a, Message, Theme, Renderer>>,
+        view: impl Fn(T) -> E + 'a,
+    ) -> Self
+    where
+        T: 'a,
+        E: Into<Element<'a, Message, Theme, Renderer>>,
+    {
+        self.columns.push(column(header, view));
+        self
+    }
+}
+
+impl<'a, T, Message, Theme, Renderer> IntoIterator
+    for Definition<'a, T, Message, Theme, Renderer>
+{
+    type Item = Column<'a, T, Message, Theme, Renderer>;
+    type IntoIter = ::std::vec::IntoIter<Self::Item>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.columns.into_iter()
+    }
+}
+
+pub struct Column<
+    'a,
+    T,
+    Message,
+    Theme = crate::Theme,
+    Renderer = crate::Renderer,
+> {
+    header: Element<'a, Message, Theme, Renderer>,
+    view: Box<dyn Fn(T) -> Element<'a, Message, Theme, Renderer> + 'a>,
+    width: Length,
+}
+
+impl<'a, T, Message, Theme, Renderer> Column<'a, T, Message, Theme, Renderer> {
+    pub fn width(mut self, width: impl Into<Length>) -> Self {
+        self.width = width.into();
+        self
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct Style {
+    pub separator_x: Background,
+    pub separator_y: Background,
+}
+
+/// The theme catalog of a [`Table`].
+pub trait Catalog {
+    /// The item class of the [`Catalog`].
+    type Class<'a>;
+
+    /// The default class produced by the [`Catalog`].
+    fn default<'a>() -> Self::Class<'a>;
+
+    /// The [`Style`] of a class with the given status.
+    fn style(&self, class: &Self::Class<'_>) -> Style;
+}
+
+/// A styling function for a [`Table`].
+pub type StyleFn<'a, Theme> = Box<dyn Fn(&Theme) -> Style + 'a>;
+
+impl<Theme> From<Style> for StyleFn<'_, Theme> {
+    fn from(style: Style) -> Self {
+        Box::new(move |_theme| style)
+    }
+}
+
+impl Catalog for crate::Theme {
+    type Class<'a> = StyleFn<'a, Self>;
+
+    fn default<'a>() -> Self::Class<'a> {
+        Box::new(default)
+    }
+
+    fn style(&self, class: &Self::Class<'_>) -> Style {
+        class(self)
+    }
+}
+
+/// The default style of a [`Table`].
+pub fn default(theme: &crate::Theme) -> Style {
+    let palette = theme.extended_palette();
+
+    Style {
+        separator_x: palette.background.strong.color.into(),
+        separator_y: palette.background.strong.color.into(),
+    }
+}

From 931ed20cf8ac0d1317313a27ea3f40cd0964c205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 15 Jul 2025 20:23:44 +0200
Subject: [PATCH 02/43] Rename `spacing` to `padding` in `table` widget

---
 examples/table/src/main.rs |   2 +-
 widget/src/table.rs        | 110 ++++++++++++++++++-------------------
 2 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/examples/table/src/main.rs b/examples/table/src/main.rs
index c05208f9..f642c2e1 100644
--- a/examples/table/src/main.rs
+++ b/examples/table/src/main.rs
@@ -42,7 +42,7 @@ impl Table {
                 .column(bold("Price"), |event| text!("{:.2}", event.price))
                 .column(bold("Rating"), |event| text!("{:.2}", event.rating));
 
-            table(columns, &self.events).width(640).spacing_y(5)
+            table(columns, &self.events).width(640).padding_y(5)
         };
 
         center(scrollable(table).spacing(10)).padding(10).into()
diff --git a/widget/src/table.rs b/widget/src/table.rs
index 8e1853ca..eda54bce 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -51,8 +51,8 @@ where
     cells: Vec<Element<'a, Message, Theme, Renderer>>,
     width: Length,
     height: Length,
-    spacing_x: f32,
-    spacing_y: f32,
+    padding_x: f32,
+    padding_y: f32,
     separator_x: f32,
     separator_y: f32,
     class: Theme::Class<'a>,
@@ -105,8 +105,8 @@ where
             cells,
             width,
             height,
-            spacing_x: 10.0,
-            spacing_y: 10.0,
+            padding_x: 10.0,
+            padding_y: 10.0,
             separator_x: 1.0,
             separator_y: 1.0,
             class: Theme::default(),
@@ -118,26 +118,26 @@ where
         self
     }
 
-    pub fn spacing(self, spacing: impl Into<Pixels>) -> Self {
-        let spacing = spacing.into();
+    pub fn padding(self, padding: impl Into<Pixels>) -> Self {
+        let padding = padding.into();
 
-        self.spacing_x(spacing).spacing_y(spacing)
+        self.padding_x(padding).padding_y(padding)
     }
 
-    pub fn spacing_x(mut self, spacing: impl Into<Pixels>) -> Self {
-        self.spacing_x = spacing.into().0;
+    pub fn padding_x(mut self, padding: impl Into<Pixels>) -> Self {
+        self.padding_x = padding.into().0;
         self
     }
 
-    pub fn spacing_y(mut self, spacing: impl Into<Pixels>) -> Self {
-        self.spacing_y = spacing.into().0;
+    pub fn padding_y(mut self, padding: impl Into<Pixels>) -> Self {
+        self.padding_y = padding.into().0;
         self
     }
 }
 
 pub struct Metrics {
-    column_widths: Vec<f32>,
-    row_heights: Vec<f32>,
+    columns: Vec<f32>,
+    rows: Vec<f32>,
 }
 
 impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
@@ -159,8 +159,8 @@ where
 
     fn state(&self) -> widget::tree::State {
         widget::tree::State::new(Metrics {
-            column_widths: Vec::new(),
-            row_heights: Vec::new(),
+            columns: Vec::new(),
+            rows: Vec::new(),
         })
     }
 
@@ -189,19 +189,19 @@ where
         let mut cells = Vec::with_capacity(self.cells.len());
         cells.resize(self.cells.len(), layout::Node::default());
 
-        metrics.column_widths = vec![0.0; self.columns.len()];
-        metrics.row_heights = vec![0.0; rows];
+        metrics.columns = vec![0.0; self.columns.len()];
+        metrics.rows = vec![0.0; rows];
 
         let mut column_factors = vec![0; self.columns.len()];
         let mut row_factors = vec![0; rows];
 
-        let spacing_x = self.spacing_x * 2.0 + self.separator_x;
-        let spacing_y = self.spacing_y * 2.0 + self.separator_y;
+        let spacing_x = self.padding_x * 2.0 + self.separator_x;
+        let spacing_y = self.padding_y * 2.0 + self.separator_y;
 
         // FIRST PASS
         // Lay out non-fluid cells
-        let mut x = self.spacing_x;
-        let mut y = self.spacing_y;
+        let mut x = self.padding_x;
+        let mut y = self.padding_y;
 
         for (i, (cell, state)) in
             self.cells.iter().zip(&mut tree.children).enumerate()
@@ -229,17 +229,15 @@ where
             let layout = cell.as_widget().layout(state, renderer, &limits);
             let size = layout.size();
 
-            metrics.column_widths[column] =
-                metrics.column_widths[column].max(size.width);
-            metrics.row_heights[row] =
-                metrics.row_heights[row].max(size.height);
+            metrics.columns[column] = metrics.columns[column].max(size.width);
+            metrics.rows[row] = metrics.rows[row].max(size.height);
             cells[i] = layout;
 
             if row == 0 {
-                y = self.spacing_y;
+                y = self.padding_y;
 
                 if column > 0 {
-                    x += metrics.column_widths[column - 1] + spacing_x;
+                    x += metrics.columns[column - 1] + spacing_x;
                 }
             } else {
                 y += size.height + spacing_y;
@@ -251,7 +249,7 @@ where
         let left = Size::new(
             available.width
                 - metrics
-                    .column_widths
+                    .columns
                     .iter()
                     .enumerate()
                     .filter(|(i, _)| column_factors[*i] == 0)
@@ -259,7 +257,7 @@ where
                     .sum::<f32>(),
             available.height
                 - metrics
-                    .row_heights
+                    .rows
                     .iter()
                     .enumerate()
                     .filter(|(i, _)| row_factors[*i] == 0)
@@ -269,16 +267,16 @@ where
 
         let width_unit = (left.width
             - spacing_x * self.columns.len().saturating_sub(1) as f32
-            - self.spacing_x * 2.0)
+            - self.padding_x * 2.0)
             / column_factors.iter().sum::<u16>() as f32;
 
         let height_unit = (left.height
             - spacing_y * rows.saturating_sub(1) as f32
-            - self.spacing_y * 2.0)
+            - self.padding_y * 2.0)
             / row_factors.iter().sum::<u16>() as f32;
 
-        let mut x = self.spacing_x;
-        let mut y = self.spacing_y;
+        let mut x = self.padding_x;
+        let mut y = self.padding_y;
 
         for (i, (cell, state)) in
             self.cells.iter().zip(&mut tree.children).enumerate()
@@ -312,18 +310,17 @@ where
                 let layout = cell.as_widget().layout(state, renderer, &limits);
                 let size = layout.size();
 
-                metrics.column_widths[column] =
-                    metrics.column_widths[column].max(size.width);
-                metrics.row_heights[row] =
-                    metrics.row_heights[row].max(size.height);
+                metrics.columns[column] =
+                    metrics.columns[column].max(size.width);
+                metrics.rows[row] = metrics.rows[row].max(size.height);
                 cells[i] = layout;
             }
 
             if row == 0 {
-                y = self.spacing_y;
+                y = self.padding_y;
 
                 if column > 0 {
-                    x += metrics.column_widths[column - 1] + spacing_x;
+                    x += metrics.columns[column - 1] + spacing_x;
                 }
             } else {
                 y += cells[i].size().height + spacing_y;
@@ -332,24 +329,24 @@ where
 
         // THIRD PASS
         // Position each cell
-        let mut x = self.spacing_x;
-        let mut y = self.spacing_y;
+        let mut x = self.padding_x;
+        let mut y = self.padding_y;
 
         for (i, cell) in cells.iter_mut().enumerate() {
             let column = i / rows;
             let row = i % rows;
 
             if row == 0 {
-                y = self.spacing_y;
+                y = self.padding_y;
 
                 if column > 0 {
-                    x += metrics.column_widths[column - 1] + spacing_x;
+                    x += metrics.columns[column - 1] + spacing_x;
                 }
             }
 
             cell.move_to_mut((x, y));
 
-            y += metrics.row_heights[row] + spacing_y;
+            y += metrics.rows[row] + spacing_y;
         }
 
         let intrinsic = limits.resolve(
@@ -357,12 +354,12 @@ where
             self.height,
             Size::new(
                 x + metrics
-                    .column_widths
+                    .columns
                     .last()
                     .copied()
-                    .map(|width| width + self.spacing_x)
+                    .map(|width| width + self.padding_x)
                     .unwrap_or_default(),
-                y - spacing_y + self.spacing_y,
+                y - spacing_y + self.padding_y,
             ),
         );
 
@@ -391,12 +388,12 @@ where
         let style = theme.style(&self.class);
 
         if self.separator_x > 0.0 {
-            let mut x = self.spacing_x;
+            let mut x = self.padding_x;
 
-            for width in &metrics.column_widths
-                [..metrics.column_widths.len().saturating_sub(1)]
+            for width in
+                &metrics.columns[..metrics.columns.len().saturating_sub(1)]
             {
-                x += width + self.spacing_x;
+                x += width + self.padding_x;
 
                 renderer.fill_quad(
                     renderer::Quad {
@@ -412,17 +409,16 @@ where
                     style.separator_x,
                 );
 
-                x += self.separator_x + self.spacing_x;
+                x += self.separator_x + self.padding_x;
             }
         }
 
         if self.separator_y > 0.0 {
-            let mut y = self.spacing_y;
+            let mut y = self.padding_y;
 
-            for height in &metrics.row_heights
-                [..metrics.row_heights.len().saturating_sub(1)]
+            for height in &metrics.rows[..metrics.rows.len().saturating_sub(1)]
             {
-                y += height + self.spacing_y;
+                y += height + self.padding_y;
 
                 renderer.fill_quad(
                     renderer::Quad {
@@ -438,7 +434,7 @@ where
                     style.separator_y,
                 );
 
-                y += self.separator_y + self.spacing_y;
+                y += self.separator_y + self.padding_y;
             }
         }
     }

From 2777de3c7d440de50bc16ee1062b05dc39c994dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 16 Jul 2025 00:10:05 +0200
Subject: [PATCH 03/43] Add interactive controls to `table` example

---
 examples/table/src/main.rs | 98 +++++++++++++++++++++++++++++++++-----
 widget/src/table.rs        | 61 +++++++-----------------
 2 files changed, 102 insertions(+), 57 deletions(-)

diff --git a/examples/table/src/main.rs b/examples/table/src/main.rs
index f642c2e1..896dac93 100644
--- a/examples/table/src/main.rs
+++ b/examples/table/src/main.rs
@@ -1,7 +1,10 @@
 use iced::font;
 use iced::time::{Duration, hours, minutes};
-use iced::widget::{center, scrollable, table, text};
-use iced::{Element, Fill, Font};
+use iced::widget::{
+    center, center_x, column, container, row, scrollable, slider, table, text,
+    tooltip,
+};
+use iced::{Center, Element, Fill, Font};
 
 pub fn main() -> iced::Result {
     iced::application(Table::new, Table::update, Table::view).run()
@@ -9,20 +12,30 @@ pub fn main() -> iced::Result {
 
 struct Table {
     events: Vec<Event>,
+    padding: (f32, f32),
+    separator: (f32, f32),
 }
 
 #[derive(Debug, Clone)]
-enum Message {}
+enum Message {
+    PaddingChanged(f32, f32),
+    SeparatorChanged(f32, f32),
+}
 
 impl Table {
     fn new() -> Self {
         Self {
             events: Event::list(),
+            padding: (10.0, 5.0),
+            separator: (1.0, 1.0),
         }
     }
 
     fn update(&mut self, message: Message) {
-        match message {}
+        match message {
+            Message::PaddingChanged(x, y) => self.padding = (x, y),
+            Message::SeparatorChanged(x, y) => self.separator = (x, y),
+        }
     }
 
     fn view(&self) -> Element<'_, Message> {
@@ -34,18 +47,79 @@ impl Table {
                 })
             };
 
-            let columns = table::definition()
-                .column(bold("Name"), |event: &Event| {
+            let columns = [
+                table::column(bold("Name"), |event: &Event| {
                     text(&event.name).width(Fill)
-                })
-                .column(bold("Time"), |event| text!("{:?}", event.duration))
-                .column(bold("Price"), |event| text!("{:.2}", event.price))
-                .column(bold("Rating"), |event| text!("{:.2}", event.rating));
+                }),
+                table::column(bold("Time"), |event: &Event| {
+                    text!("{} min", event.duration.as_secs() / 60)
+                }),
+                table::column(bold("Price"), |event: &Event| {
+                    if event.price > 0.0 {
+                        text!("${:.2}", event.price)
+                    } else {
+                        text("Free")
+                    }
+                }),
+                table::column(bold("Rating"), |event: &Event| {
+                    text!("{:.2}", event.rating)
+                }),
+            ];
 
-            table(columns, &self.events).width(640).padding_y(5)
+            table(columns, &self.events)
+                .width(640)
+                .padding_x(self.padding.0)
+                .padding_y(self.padding.1)
+                .separator_x(self.separator.0)
+                .separator_y(self.separator.1)
         };
 
-        center(scrollable(table).spacing(10)).padding(10).into()
+        let controls = {
+            let labeled_slider =
+                |label,
+                 range: std::ops::RangeInclusive<f32>,
+                 (x, y),
+                 on_change: fn(f32, f32) -> Message| {
+                    row![
+                        text(label).font(Font::MONOSPACE).size(14).width(200),
+                        tooltip(
+                            slider(range.clone(), x, move |x| on_change(x, y)),
+                            text!("{x:.0}px").font(Font::MONOSPACE).size(10),
+                            tooltip::Position::Left
+                        ),
+                        tooltip(
+                            slider(range, y, move |y| on_change(x, y)),
+                            text!("{y:.0}px").font(Font::MONOSPACE).size(10),
+                            tooltip::Position::Right
+                        ),
+                    ]
+                    .spacing(10)
+                    .align_y(Center)
+                };
+
+            column![
+                labeled_slider(
+                    "Padding",
+                    0.0..=30.0,
+                    self.padding,
+                    Message::PaddingChanged
+                ),
+                labeled_slider(
+                    "Separator",
+                    0.0..=5.0,
+                    self.separator,
+                    Message::SeparatorChanged
+                )
+            ]
+            .spacing(10)
+            .width(640)
+        };
+
+        column![
+            center(scrollable(table).spacing(10)).padding(10),
+            center_x(controls).padding(10).style(container::dark)
+        ]
+        .into()
     }
 }
 
diff --git a/widget/src/table.rs b/widget/src/table.rs
index eda54bce..49f2813b 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -21,13 +21,6 @@ where
     Table::new(columns, rows)
 }
 
-pub fn definition<'a, T, Message, Theme, Renderer>()
--> Definition<'a, T, Message, Theme, Renderer> {
-    Definition {
-        columns: Vec::new(),
-    }
-}
-
 pub fn column<'a, T, E, Message, Theme, Renderer>(
     header: impl Into<Element<'a, Message, Theme, Renderer>>,
     view: impl Fn(T) -> E + 'a,
@@ -133,6 +126,22 @@ where
         self.padding_y = padding.into().0;
         self
     }
+
+    pub fn separator(self, separator: impl Into<Pixels>) -> Self {
+        let separator = separator.into();
+
+        self.separator_x(separator).separator_y(separator)
+    }
+
+    pub fn separator_x(mut self, separator: impl Into<Pixels>) -> Self {
+        self.separator_x = separator.into().0;
+        self
+    }
+
+    pub fn separator_y(mut self, separator: impl Into<Pixels>) -> Self {
+        self.separator_y = separator.into().0;
+        self
+    }
 }
 
 pub struct Metrics {
@@ -452,44 +461,6 @@ where
     }
 }
 
-pub struct Definition<
-    'a,
-    T,
-    Message,
-    Theme = crate::Theme,
-    Renderer = crate::Renderer,
-> {
-    columns: Vec<Column<'a, T, Message, Theme, Renderer>>,
-}
-
-impl<'a, T, Message, Theme, Renderer>
-    Definition<'a, T, Message, Theme, Renderer>
-{
-    pub fn column<E>(
-        mut self,
-        header: impl Into<Element<'a, Message, Theme, Renderer>>,
-        view: impl Fn(T) -> E + 'a,
-    ) -> Self
-    where
-        T: 'a,
-        E: Into<Element<'a, Message, Theme, Renderer>>,
-    {
-        self.columns.push(column(header, view));
-        self
-    }
-}
-
-impl<'a, T, Message, Theme, Renderer> IntoIterator
-    for Definition<'a, T, Message, Theme, Renderer>
-{
-    type Item = Column<'a, T, Message, Theme, Renderer>;
-    type IntoIter = ::std::vec::IntoIter<Self::Item>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.columns.into_iter()
-    }
-}
-
 pub struct Column<
     'a,
     T,

From 1e89439affbbea710a2505ca757f83701e3a9ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 16 Jul 2025 02:31:43 +0200
Subject: [PATCH 04/43] Respect `column` width in `table` widget

---
 core/src/widget/text.rs    |   7 ++
 examples/table/src/main.rs |  47 ++++++++----
 widget/src/table.rs        | 144 +++++++++++++++++++++++--------------
 3 files changed, 128 insertions(+), 70 deletions(-)

diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index b5ed9bf0..972ab731 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -452,6 +452,13 @@ pub fn success(theme: &Theme) -> Style {
     }
 }
 
+/// Text conveying some mildly negative information, like a warning.
+pub fn warning(theme: &Theme) -> Style {
+    Style {
+        color: Some(theme.palette().warning),
+    }
+}
+
 /// Text conveying some negative information, like an error.
 pub fn danger(theme: &Theme) -> Style {
     Style {
diff --git a/examples/table/src/main.rs b/examples/table/src/main.rs
index 896dac93..47a81b39 100644
--- a/examples/table/src/main.rs
+++ b/examples/table/src/main.rs
@@ -1,13 +1,15 @@
 use iced::font;
 use iced::time::{Duration, hours, minutes};
 use iced::widget::{
-    center, center_x, column, container, row, scrollable, slider, table, text,
-    tooltip,
+    center_x, center_y, column, container, row, scrollable, slider, table,
+    text, tooltip,
 };
-use iced::{Center, Element, Fill, Font};
+use iced::{Center, Element, Font, Theme};
 
 pub fn main() -> iced::Result {
-    iced::application(Table::new, Table::update, Table::view).run()
+    iced::application(Table::new, Table::update, Table::view)
+        .theme(|_| Theme::CatppuccinMocha)
+        .run()
 }
 
 struct Table {
@@ -48,26 +50,41 @@ impl Table {
             };
 
             let columns = [
-                table::column(bold("Name"), |event: &Event| {
-                    text(&event.name).width(Fill)
-                }),
+                table::column(bold("Name"), |event: &Event| text(&event.name)),
                 table::column(bold("Time"), |event: &Event| {
-                    text!("{} min", event.duration.as_secs() / 60)
+                    let minutes = event.duration.as_secs() / 60;
+
+                    text!("{minutes} min").style(if minutes > 90 {
+                        text::warning
+                    } else {
+                        text::default
+                    })
                 }),
                 table::column(bold("Price"), |event: &Event| {
                     if event.price > 0.0 {
-                        text!("${:.2}", event.price)
+                        text!("${:.2}", event.price).style(
+                            if event.price > 100.0 {
+                                text::warning
+                            } else {
+                                text::default
+                            },
+                        )
                     } else {
-                        text("Free")
+                        text("Free").style(text::success)
                     }
                 }),
                 table::column(bold("Rating"), |event: &Event| {
-                    text!("{:.2}", event.rating)
+                    text!("{:.2}", event.rating).style(if event.rating > 4.7 {
+                        text::success
+                    } else if event.rating < 2.0 {
+                        text::danger
+                    } else {
+                        text::default
+                    })
                 }),
             ];
 
             table(columns, &self.events)
-                .width(640)
                 .padding_x(self.padding.0)
                 .padding_y(self.padding.1)
                 .separator_x(self.separator.0)
@@ -81,7 +98,7 @@ impl Table {
                  (x, y),
                  on_change: fn(f32, f32) -> Message| {
                     row![
-                        text(label).font(Font::MONOSPACE).size(14).width(200),
+                        text(label).font(Font::MONOSPACE).size(14).width(100),
                         tooltip(
                             slider(range.clone(), x, move |x| on_change(x, y)),
                             text!("{x:.0}px").font(Font::MONOSPACE).size(10),
@@ -112,11 +129,11 @@ impl Table {
                 )
             ]
             .spacing(10)
-            .width(640)
+            .width(400)
         };
 
         column![
-            center(scrollable(table).spacing(10)).padding(10),
+            center_y(scrollable(center_x(table)).spacing(10)).padding(10),
             center_x(controls).padding(10).style(container::dark)
         ]
         .into()
diff --git a/widget/src/table.rs b/widget/src/table.rs
index 49f2813b..169e07e2 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -73,28 +73,33 @@ where
             columns.size_hint().0 * (1 + rows.size_hint().0),
         );
 
+        let mut columns: Vec<_> = columns
+            .into_iter()
+            .map(|column| {
+                cells.push(column.header);
+                cells.extend(rows.clone().map(|row| {
+                    let cell = (column.view)(row);
+                    let size_hint = cell.as_widget().size_hint();
+
+                    height = height.enclose(size_hint.height);
+
+                    cell
+                }));
+
+                width = width.enclose(column.width);
+
+                column.width
+            })
+            .collect();
+
+        if width == Length::Shrink {
+            if let Some(first) = columns.first_mut() {
+                *first = Length::Fill;
+            }
+        }
+
         Self {
-            columns: columns
-                .into_iter()
-                .map(|column| {
-                    let mut column_width = column.width;
-
-                    cells.push(column.header);
-                    cells.extend(rows.clone().map(|row| {
-                        let cell = (column.view)(row);
-                        let size_hint = cell.as_widget().size_hint();
-
-                        column_width = column_width.enclose(size_hint.width);
-                        height = height.enclose(size_hint.height);
-
-                        cell
-                    }));
-
-                    width = width.enclose(column_width);
-
-                    column_width
-                })
-                .collect(),
+            columns,
             cells,
             width,
             height,
@@ -191,9 +196,11 @@ where
         limits: &layout::Limits,
     ) -> layout::Node {
         let metrics = tree.state.downcast_mut::<Metrics>();
-        let limits = limits.width(self.width).height(self.height);
         let rows = self.cells.len() / self.columns.len();
+
+        let limits = limits.width(self.width).height(self.height);
         let available = limits.max();
+        let table_fluid = self.width.fluid();
 
         let mut cells = Vec::with_capacity(self.cells.len());
         cells.resize(self.cells.len(), layout::Node::default());
@@ -217,14 +224,27 @@ where
         {
             let column = i / rows;
             let row = i % rows;
+
+            let width = self.columns[column];
             let size = cell.as_widget().size();
 
-            if size.width.fill_factor() != 0 || size.height.fill_factor() != 0 {
-                column_factors[column] =
-                    column_factors[column].max(size.width.fill_factor());
+            if row == 0 {
+                y = self.padding_y;
 
-                row_factors[row] =
-                    row_factors[row].max(size.height.fill_factor());
+                if column > 0 {
+                    x += metrics.columns[column - 1] + spacing_x;
+                }
+            }
+
+            let width_factor =
+                width.fill_factor().max(size.width.fill_factor());
+            let height_factor = size.height.fill_factor();
+
+            if width_factor != 0 || height_factor != 0 {
+                column_factors[column] =
+                    column_factors[column].max(width_factor);
+
+                row_factors[row] = row_factors[row].max(height_factor);
 
                 continue;
             }
@@ -233,24 +253,16 @@ where
                 Size::ZERO,
                 Size::new(available.width - x, available.height - y),
             )
-            .width(self.columns[i / rows]);
+            .width(width);
 
             let layout = cell.as_widget().layout(state, renderer, &limits);
-            let size = layout.size();
+            let size = limits.resolve(width, Length::Shrink, layout.size());
 
             metrics.columns[column] = metrics.columns[column].max(size.width);
             metrics.rows[row] = metrics.rows[row].max(size.height);
             cells[i] = layout;
 
-            if row == 0 {
-                y = self.padding_y;
-
-                if column > 0 {
-                    x += metrics.columns[column - 1] + spacing_x;
-                }
-            } else {
-                y += size.height + spacing_y;
-            }
+            y += size.height + spacing_y;
         }
 
         // SECOND PASS
@@ -292,20 +304,42 @@ where
         {
             let column = i / rows;
             let row = i % rows;
+
             let size = cell.as_widget().size();
 
-            if size.width.fill_factor() != 0 || size.height.fill_factor() != 0 {
-                let column_factor = column_factors[column];
+            let width = self.columns[column];
+            let width_factor = width.fill_factor();
+
+            if row == 0 {
+                y = self.padding_y;
+
+                if column > 0 {
+                    x += metrics.columns[column - 1] + spacing_x;
+                }
+            }
+
+            if width_factor != 0
+                || size.width.fill_factor() != 0
+                || size.height.fill_factor() != 0
+            {
                 let row_factor = row_factors[row];
 
-                let max_width = if column_factor == 0 {
-                    (available.width - x).max(0.0)
+                let max_width = if width_factor == 0 {
+                    if size.width.is_fill() {
+                        metrics.columns[column]
+                    } else {
+                        (available.width - x).max(0.0)
+                    }
                 } else {
-                    width_unit * column_factor as f32
+                    width_unit * width_factor as f32
                 };
 
                 let max_height = if row_factor == 0 {
-                    (available.height - y).max(0.0)
+                    if size.height.is_fill() {
+                        metrics.rows[row]
+                    } else {
+                        (available.height - y).max(0.0)
+                    }
                 } else {
                     height_unit * row_factor as f32
                 };
@@ -314,25 +348,25 @@ where
                     Size::ZERO,
                     Size::new(max_width, max_height),
                 )
-                .width(self.columns[i / rows]);
+                .width(width);
 
                 let layout = cell.as_widget().layout(state, renderer, &limits);
-                let size = layout.size();
+                let size = limits.resolve(
+                    if let Length::Fixed(_) = width {
+                        width
+                    } else {
+                        table_fluid
+                    },
+                    Length::Shrink,
+                    layout.size(),
+                );
 
                 metrics.columns[column] =
                     metrics.columns[column].max(size.width);
                 metrics.rows[row] = metrics.rows[row].max(size.height);
                 cells[i] = layout;
-            }
 
-            if row == 0 {
-                y = self.padding_y;
-
-                if column > 0 {
-                    x += metrics.columns[column - 1] + spacing_x;
-                }
-            } else {
-                y += cells[i].size().height + spacing_y;
+                y += size.height + spacing_y;
             }
         }
 

From 6e71c7dd6f8837e26d1900bcaa68863f75e95cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 16 Jul 2025 04:06:38 +0200
Subject: [PATCH 05/43] Implement `alignment` support for `table::column`

---
 core/src/layout/node.rs    | 14 +++++-----
 examples/table/src/main.rs | 16 +++++++----
 widget/src/table.rs        | 55 +++++++++++++++++++++++++++++++++-----
 3 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/core/src/layout/node.rs b/core/src/layout/node.rs
index 0c0f90fb..6fb5d395 100644
--- a/core/src/layout/node.rs
+++ b/core/src/layout/node.rs
@@ -52,22 +52,22 @@ impl Node {
     /// Aligns the [`Node`] in the given space.
     pub fn align(
         mut self,
-        horizontal_alignment: Alignment,
-        vertical_alignment: Alignment,
+        align_x: Alignment,
+        align_y: Alignment,
         space: Size,
     ) -> Self {
-        self.align_mut(horizontal_alignment, vertical_alignment, space);
+        self.align_mut(align_x, align_y, space);
         self
     }
 
     /// Mutable reference version of [`Self::align`].
     pub fn align_mut(
         &mut self,
-        horizontal_alignment: Alignment,
-        vertical_alignment: Alignment,
+        align_x: Alignment,
+        align_y: Alignment,
         space: Size,
     ) {
-        match horizontal_alignment {
+        match align_x {
             Alignment::Start => {}
             Alignment::Center => {
                 self.bounds.x += (space.width - self.bounds.width) / 2.0;
@@ -77,7 +77,7 @@ impl Node {
             }
         }
 
-        match vertical_alignment {
+        match align_y {
             Alignment::Start => {}
             Alignment::Center => {
                 self.bounds.y += (space.height - self.bounds.height) / 2.0;
diff --git a/examples/table/src/main.rs b/examples/table/src/main.rs
index 47a81b39..26a8e621 100644
--- a/examples/table/src/main.rs
+++ b/examples/table/src/main.rs
@@ -4,7 +4,7 @@ use iced::widget::{
     center_x, center_y, column, container, row, scrollable, slider, table,
     text, tooltip,
 };
-use iced::{Center, Element, Font, Theme};
+use iced::{Center, Element, Fill, Font, Right, Theme};
 
 pub fn main() -> iced::Result {
     iced::application(Table::new, Table::update, Table::view)
@@ -59,7 +59,9 @@ impl Table {
                     } else {
                         text::default
                     })
-                }),
+                })
+                .align_x(Right)
+                .align_y(Center),
                 table::column(bold("Price"), |event: &Event| {
                     if event.price > 0.0 {
                         text!("${:.2}", event.price).style(
@@ -70,9 +72,11 @@ impl Table {
                             },
                         )
                     } else {
-                        text("Free").style(text::success)
+                        text("Free").style(text::success).width(Fill).center()
                     }
-                }),
+                })
+                .align_x(Right)
+                .align_y(Center),
                 table::column(bold("Rating"), |event: &Event| {
                     text!("{:.2}", event.rating).style(if event.rating > 4.7 {
                         text::success
@@ -81,7 +85,9 @@ impl Table {
                     } else {
                         text::default
                     })
-                }),
+                })
+                .align_x(Right)
+                .align_y(Center),
             ];
 
             table(columns, &self.events)
diff --git a/widget/src/table.rs b/widget/src/table.rs
index 169e07e2..b18dcf7b 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -1,11 +1,13 @@
 #![allow(missing_docs, missing_debug_implementations)]
 use crate::core;
+use crate::core::alignment;
 use crate::core::layout;
 use crate::core::mouse;
 use crate::core::renderer;
 use crate::core::widget;
 use crate::core::{
-    Background, Element, Layout, Length, Pixels, Rectangle, Size, Widget,
+    Alignment, Background, Element, Layout, Length, Pixels, Rectangle, Size,
+    Widget,
 };
 
 pub fn table<'a, R, T, Message, Theme, Renderer>(
@@ -33,6 +35,8 @@ where
         header: header.into(),
         view: Box::new(move |data| view(data).into()),
         width: Length::Shrink,
+        align_x: alignment::Horizontal::Left,
+        align_y: alignment::Vertical::Top,
     }
 }
 
@@ -40,7 +44,7 @@ pub struct Table<'a, Message, Theme = crate::Theme, Renderer = crate::Renderer>
 where
     Theme: Catalog,
 {
-    columns: Vec<Length>,
+    columns: Vec<Column_>,
     cells: Vec<Element<'a, Message, Theme, Renderer>>,
     width: Length,
     height: Length,
@@ -51,6 +55,12 @@ where
     class: Theme::Class<'a>,
 }
 
+struct Column_ {
+    width: Length,
+    align_x: alignment::Horizontal,
+    align_y: alignment::Vertical,
+}
+
 impl<'a, Message, Theme, Renderer> Table<'a, Message, Theme, Renderer>
 where
     Theme: Catalog,
@@ -88,13 +98,17 @@ where
 
                 width = width.enclose(column.width);
 
-                column.width
+                Column_ {
+                    width: column.width,
+                    align_x: column.align_x,
+                    align_y: column.align_y,
+                }
             })
             .collect();
 
         if width == Length::Shrink {
             if let Some(first) = columns.first_mut() {
-                *first = Length::Fill;
+                first.width = Length::Fill;
             }
         }
 
@@ -225,7 +239,7 @@ where
             let column = i / rows;
             let row = i % rows;
 
-            let width = self.columns[column];
+            let width = self.columns[column].width;
             let size = cell.as_widget().size();
 
             if row == 0 {
@@ -307,7 +321,7 @@ where
 
             let size = cell.as_widget().size();
 
-            let width = self.columns[column];
+            let width = self.columns[column].width;
             let width_factor = width.fill_factor();
 
             if row == 0 {
@@ -387,7 +401,16 @@ where
                 }
             }
 
+            let Column_ {
+                align_x, align_y, ..
+            } = &self.columns[column];
+
             cell.move_to_mut((x, y));
+            cell.align_mut(
+                Alignment::from(*align_x),
+                Alignment::from(*align_y),
+                Size::new(metrics.columns[column], metrics.rows[row]),
+            );
 
             y += metrics.rows[row] + spacing_y;
         }
@@ -505,6 +528,8 @@ pub struct Column<
     header: Element<'a, Message, Theme, Renderer>,
     view: Box<dyn Fn(T) -> Element<'a, Message, Theme, Renderer> + 'a>,
     width: Length,
+    align_x: alignment::Horizontal,
+    align_y: alignment::Vertical,
 }
 
 impl<'a, T, Message, Theme, Renderer> Column<'a, T, Message, Theme, Renderer> {
@@ -512,6 +537,24 @@ impl<'a, T, Message, Theme, Renderer> Column<'a, T, Message, Theme, Renderer> {
         self.width = width.into();
         self
     }
+
+    /// Sets the alignment for the horizontal axis of the [`Column`].
+    pub fn align_x(
+        mut self,
+        alignment: impl Into<alignment::Horizontal>,
+    ) -> Self {
+        self.align_x = alignment.into();
+        self
+    }
+
+    /// Sets the alignment for the vertical axis of the [`Column`].
+    pub fn align_y(
+        mut self,
+        alignment: impl Into<alignment::Vertical>,
+    ) -> Self {
+        self.align_y = alignment.into();
+        self
+    }
 }
 
 #[derive(Debug, Clone, Copy)]

From a3d42e2d3751d88096152eb13a84648141e54d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 16 Jul 2025 21:39:40 +0200
Subject: [PATCH 06/43] Fix `width` column factor computation in `table`

---
 widget/src/table.rs | 102 ++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/widget/src/table.rs b/widget/src/table.rs
index b18dcf7b..74f3e7b3 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -250,11 +250,10 @@ where
                 }
             }
 
-            let width_factor =
-                width.fill_factor().max(size.width.fill_factor());
+            let width_factor = width.fill_factor();
             let height_factor = size.height.fill_factor();
 
-            if width_factor != 0 || height_factor != 0 {
+            if width_factor != 0 || height_factor != 0 || size.width.is_fill() {
                 column_factors[column] =
                     column_factors[column].max(width_factor);
 
@@ -332,56 +331,57 @@ where
                 }
             }
 
-            if width_factor != 0
-                || size.width.fill_factor() != 0
-                || size.height.fill_factor() != 0
+            if width_factor == 0
+                && size.width.fill_factor() == 0
+                && size.height.fill_factor() == 0
             {
-                let row_factor = row_factors[row];
-
-                let max_width = if width_factor == 0 {
-                    if size.width.is_fill() {
-                        metrics.columns[column]
-                    } else {
-                        (available.width - x).max(0.0)
-                    }
-                } else {
-                    width_unit * width_factor as f32
-                };
-
-                let max_height = if row_factor == 0 {
-                    if size.height.is_fill() {
-                        metrics.rows[row]
-                    } else {
-                        (available.height - y).max(0.0)
-                    }
-                } else {
-                    height_unit * row_factor as f32
-                };
-
-                let limits = layout::Limits::new(
-                    Size::ZERO,
-                    Size::new(max_width, max_height),
-                )
-                .width(width);
-
-                let layout = cell.as_widget().layout(state, renderer, &limits);
-                let size = limits.resolve(
-                    if let Length::Fixed(_) = width {
-                        width
-                    } else {
-                        table_fluid
-                    },
-                    Length::Shrink,
-                    layout.size(),
-                );
-
-                metrics.columns[column] =
-                    metrics.columns[column].max(size.width);
-                metrics.rows[row] = metrics.rows[row].max(size.height);
-                cells[i] = layout;
-
-                y += size.height + spacing_y;
+                continue;
             }
+
+            let row_factor = row_factors[row];
+
+            let max_width = if width_factor == 0 {
+                if size.width.is_fill() {
+                    metrics.columns[column]
+                } else {
+                    (available.width - x).max(0.0)
+                }
+            } else {
+                width_unit * width_factor as f32
+            };
+
+            let max_height = if row_factor == 0 {
+                if size.height.is_fill() {
+                    metrics.rows[row]
+                } else {
+                    (available.height - y).max(0.0)
+                }
+            } else {
+                height_unit * row_factor as f32
+            };
+
+            let limits = layout::Limits::new(
+                Size::ZERO,
+                Size::new(max_width, max_height),
+            )
+            .width(width);
+
+            let layout = cell.as_widget().layout(state, renderer, &limits);
+            let size = limits.resolve(
+                if let Length::Fixed(_) = width {
+                    width
+                } else {
+                    table_fluid
+                },
+                Length::Shrink,
+                layout.size(),
+            );
+
+            metrics.columns[column] = metrics.columns[column].max(size.width);
+            metrics.rows[row] = metrics.rows[row].max(size.height);
+            cells[i] = layout;
+
+            y += size.height + spacing_y;
         }
 
         // THIRD PASS

From 291e615c0b6f046a6c8af03c21470f99d618b094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 16 Jul 2025 22:38:09 +0200
Subject: [PATCH 07/43] Use row-major order for `cells` in `table` widget

---
 widget/src/table.rs | 145 +++++++++++++++++++++++---------------------
 1 file changed, 76 insertions(+), 69 deletions(-)

diff --git a/widget/src/table.rs b/widget/src/table.rs
index 74f3e7b3..32c94956 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -10,13 +10,12 @@ use crate::core::{
     Widget,
 };
 
-pub fn table<'a, R, T, Message, Theme, Renderer>(
+pub fn table<'a, T, Message, Theme, Renderer>(
     columns: impl IntoIterator<Item = Column<'a, T, Message, Theme, Renderer>>,
-    rows: R,
+    rows: impl IntoIterator<Item = T>,
 ) -> Table<'a, Message, Theme, Renderer>
 where
-    R: IntoIterator<Item = T>,
-    R::IntoIter: Clone,
+    T: Clone,
     Theme: Catalog,
     Renderer: core::Renderer,
 {
@@ -66,46 +65,51 @@ where
     Theme: Catalog,
     Renderer: core::Renderer,
 {
-    pub fn new<R, T>(
+    pub fn new<T>(
         columns: impl IntoIterator<Item = Column<'a, T, Message, Theme, Renderer>>,
-        rows: R,
+        rows: impl IntoIterator<Item = T>,
     ) -> Self
     where
-        R: IntoIterator<Item = T>,
-        R::IntoIter: Clone,
+        T: Clone,
     {
         let columns = columns.into_iter();
         let rows = rows.into_iter();
 
         let mut width = Length::Shrink;
         let mut height = Length::Shrink;
+
         let mut cells = Vec::with_capacity(
             columns.size_hint().0 * (1 + rows.size_hint().0),
         );
 
-        let mut columns: Vec<_> = columns
-            .into_iter()
+        let (mut columns, views): (Vec<_>, Vec<_>) = columns
             .map(|column| {
-                cells.push(column.header);
-                cells.extend(rows.clone().map(|row| {
-                    let cell = (column.view)(row);
-                    let size_hint = cell.as_widget().size_hint();
-
-                    height = height.enclose(size_hint.height);
-
-                    cell
-                }));
-
                 width = width.enclose(column.width);
 
-                Column_ {
-                    width: column.width,
-                    align_x: column.align_x,
-                    align_y: column.align_y,
-                }
+                cells.push(column.header);
+
+                (
+                    Column_ {
+                        width: column.width,
+                        align_x: column.align_x,
+                        align_y: column.align_y,
+                    },
+                    column.view,
+                )
             })
             .collect();
 
+        for row in rows {
+            for view in &views {
+                let cell = view(row.clone());
+                let size_hint = cell.as_widget().size_hint();
+
+                height = height.enclose(size_hint.height);
+
+                cells.push(cell);
+            }
+        }
+
         if width == Length::Shrink {
             if let Some(first) = columns.first_mut() {
                 first.width = Length::Fill;
@@ -163,7 +167,7 @@ where
     }
 }
 
-pub struct Metrics {
+struct Metrics {
     columns: Vec<f32>,
     rows: Vec<f32>,
 }
@@ -210,7 +214,8 @@ where
         limits: &layout::Limits,
     ) -> layout::Node {
         let metrics = tree.state.downcast_mut::<Metrics>();
-        let rows = self.cells.len() / self.columns.len();
+        let columns = self.columns.len();
+        let rows = self.cells.len() / columns;
 
         let limits = limits.width(self.width).height(self.height);
         let available = limits.max();
@@ -223,7 +228,9 @@ where
         metrics.rows = vec![0.0; rows];
 
         let mut column_factors = vec![0; self.columns.len()];
-        let mut row_factors = vec![0; rows];
+        let mut total_row_factors = 0;
+        let mut total_fluid_height = 0.0;
+        let mut row_factor = 0;
 
         let spacing_x = self.padding_x * 2.0 + self.separator_x;
         let spacing_y = self.padding_y * 2.0 + self.separator_y;
@@ -236,17 +243,24 @@ where
         for (i, (cell, state)) in
             self.cells.iter().zip(&mut tree.children).enumerate()
         {
-            let column = i / rows;
-            let row = i % rows;
+            let row = i / columns;
+            let column = i % columns;
 
             let width = self.columns[column].width;
             let size = cell.as_widget().size();
 
-            if row == 0 {
-                y = self.padding_y;
+            if column == 0 {
+                x = self.padding_x;
 
-                if column > 0 {
-                    x += metrics.columns[column - 1] + spacing_x;
+                if row > 0 {
+                    y += metrics.rows[row - 1] + spacing_y;
+
+                    if row_factor != 0 {
+                        total_fluid_height += metrics.rows[row - 1];
+                        total_row_factors += row_factor;
+
+                        row_factor = 0;
+                    }
                 }
             }
 
@@ -257,7 +271,7 @@ where
                 column_factors[column] =
                     column_factors[column].max(width_factor);
 
-                row_factors[row] = row_factors[row].max(height_factor);
+                row_factor = row_factor.max(height_factor);
 
                 continue;
             }
@@ -275,7 +289,7 @@ where
             metrics.rows[row] = metrics.rows[row].max(size.height);
             cells[i] = layout;
 
-            y += size.height + spacing_y;
+            x += size.width + spacing_x;
         }
 
         // SECOND PASS
@@ -289,14 +303,7 @@ where
                     .filter(|(i, _)| column_factors[*i] == 0)
                     .map(|(_, width)| width)
                     .sum::<f32>(),
-            available.height
-                - metrics
-                    .rows
-                    .iter()
-                    .enumerate()
-                    .filter(|(i, _)| row_factors[*i] == 0)
-                    .map(|(_, height)| height)
-                    .sum::<f32>(),
+            available.height - total_fluid_height,
         );
 
         let width_unit = (left.width
@@ -307,7 +314,7 @@ where
         let height_unit = (left.height
             - spacing_y * rows.saturating_sub(1) as f32
             - self.padding_y * 2.0)
-            / row_factors.iter().sum::<u16>() as f32;
+            / total_row_factors as f32;
 
         let mut x = self.padding_x;
         let mut y = self.padding_y;
@@ -315,19 +322,20 @@ where
         for (i, (cell, state)) in
             self.cells.iter().zip(&mut tree.children).enumerate()
         {
-            let column = i / rows;
-            let row = i % rows;
+            let row = i / columns;
+            let column = i % columns;
 
             let size = cell.as_widget().size();
 
             let width = self.columns[column].width;
             let width_factor = width.fill_factor();
+            let height_factor = size.height.fill_factor();
 
-            if row == 0 {
-                y = self.padding_y;
+            if column == 0 {
+                x = self.padding_x;
 
-                if column > 0 {
-                    x += metrics.columns[column - 1] + spacing_x;
+                if row > 0 {
+                    y += metrics.rows[row - 1] + spacing_y;
                 }
             }
 
@@ -338,8 +346,6 @@ where
                 continue;
             }
 
-            let row_factor = row_factors[row];
-
             let max_width = if width_factor == 0 {
                 if size.width.is_fill() {
                     metrics.columns[column]
@@ -350,14 +356,14 @@ where
                 width_unit * width_factor as f32
             };
 
-            let max_height = if row_factor == 0 {
+            let max_height = if height_factor == 0 {
                 if size.height.is_fill() {
                     metrics.rows[row]
                 } else {
                     (available.height - y).max(0.0)
                 }
             } else {
-                height_unit * row_factor as f32
+                height_unit * height_factor as f32
             };
 
             let limits = layout::Limits::new(
@@ -381,7 +387,7 @@ where
             metrics.rows[row] = metrics.rows[row].max(size.height);
             cells[i] = layout;
 
-            y += size.height + spacing_y;
+            x += size.width + spacing_x;
         }
 
         // THIRD PASS
@@ -390,14 +396,14 @@ where
         let mut y = self.padding_y;
 
         for (i, cell) in cells.iter_mut().enumerate() {
-            let column = i / rows;
-            let row = i % rows;
+            let row = i / columns;
+            let column = i % columns;
 
-            if row == 0 {
-                y = self.padding_y;
+            if column == 0 {
+                x = self.padding_x;
 
-                if column > 0 {
-                    x += metrics.columns[column - 1] + spacing_x;
+                if row > 0 {
+                    y += metrics.rows[row - 1] + spacing_y;
                 }
             }
 
@@ -412,20 +418,20 @@ where
                 Size::new(metrics.columns[column], metrics.rows[row]),
             );
 
-            y += metrics.rows[row] + spacing_y;
+            x += metrics.columns[column] + spacing_x;
         }
 
         let intrinsic = limits.resolve(
             self.width,
             self.height,
             Size::new(
-                x + metrics
-                    .columns
+                x - spacing_x + self.padding_x,
+                y + metrics
+                    .rows
                     .last()
                     .copied()
-                    .map(|width| width + self.padding_x)
+                    .map(|height| height + self.padding_y)
                     .unwrap_or_default(),
-                y - spacing_y + self.padding_y,
             ),
         );
 
@@ -599,9 +605,10 @@ impl Catalog for crate::Theme {
 /// The default style of a [`Table`].
 pub fn default(theme: &crate::Theme) -> Style {
     let palette = theme.extended_palette();
+    let separator = palette.background.strong.color.into();
 
     Style {
-        separator_x: palette.background.strong.color.into(),
-        separator_y: palette.background.strong.color.into(),
+        separator_x: separator,
+        separator_y: separator,
     }
 }

From dcea10f7071e904d4f6343cf31164de825ad5cf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Thu, 17 Jul 2025 03:48:45 +0200
Subject: [PATCH 08/43] Add `table` support to `markdown` widget

---
 widget/src/markdown.rs | 267 ++++++++++++++++++++++++++++++++++-------
 widget/src/table.rs    |  25 ++--
 2 files changed, 240 insertions(+), 52 deletions(-)

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index be88c5f9..fe456360 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -43,6 +43,7 @@
 //!     }
 //! }
 //! ```
+use crate::core::alignment;
 use crate::core::border;
 use crate::core::font::{self, Font};
 use crate::core::padding;
@@ -107,13 +108,17 @@ impl Content {
         let mut leftover = std::mem::take(&mut self.state.leftover);
         leftover.push_str(markdown);
 
+        let input = if leftover.trim_end().ends_with('|') {
+            leftover.trim_end().trim_end_matches('|')
+        } else {
+            leftover.as_str()
+        };
+
         // Pop the last item
         let _ = self.items.pop();
 
         // Re-parse last item and new text
-        for (item, source, broken_links) in
-            parse_with(&mut self.state, &leftover)
-        {
+        for (item, source, broken_links) in parse_with(&mut self.state, input) {
             if !broken_links.is_empty() {
                 let _ = self.incomplete.insert(
                     self.items.len(),
@@ -127,6 +132,8 @@ impl Content {
             self.items.push(item);
         }
 
+        self.state.leftover.push_str(&leftover[input.len()..]);
+
         // Re-parse incomplete sections if new references are available
         if !self.incomplete.is_empty() {
             self.incomplete.retain(|index, section| {
@@ -215,6 +222,29 @@ pub enum Item {
     Quote(Vec<Item>),
     /// A horizontal separator.
     Rule,
+    /// A table.
+    Table {
+        /// The columns of the table.
+        columns: Vec<Column>,
+        /// The rows of the table.
+        rows: Vec<Row>,
+    },
+}
+
+/// The column of a table.
+#[derive(Debug, Clone)]
+pub struct Column {
+    /// The header of the column.
+    pub header: Vec<Item>,
+    /// The alignment of the column.
+    pub alignment: pulldown_cmark::Alignment,
+}
+
+/// The row of a table.
+#[derive(Debug, Clone)]
+pub struct Row {
+    /// The cells of the row.
+    cells: Vec<Vec<Item>>,
 }
 
 /// A bunch of parsed Markdown text.
@@ -462,6 +492,12 @@ fn parse_with<'a>(
     enum Scope {
         List(List),
         Quote(Vec<Item>),
+        Table {
+            alignment: Vec<pulldown_cmark::Alignment>,
+            columns: Vec<Column>,
+            rows: Vec<Row>,
+            current: Vec<Item>,
+        },
     }
 
     struct List {
@@ -479,7 +515,6 @@ fn parse_with<'a>(
     let mut emphasis = false;
     let mut strikethrough = false;
     let mut metadata = false;
-    let mut table = false;
     let mut code_block = false;
     let mut link = None;
     let mut image = None;
@@ -535,6 +570,9 @@ fn parse_with<'a>(
                 Scope::Quote(items) => {
                     items.push(item);
                 }
+                Scope::Table { current, .. } => {
+                    current.push(item);
+                }
             }
 
             None
@@ -555,21 +593,19 @@ fn parse_with<'a>(
     #[allow(clippy::drain_collect)]
     parser.filter_map(move |(event, source)| match event {
         pulldown_cmark::Event::Start(tag) => match tag {
-            pulldown_cmark::Tag::Strong if !metadata && !table => {
+            pulldown_cmark::Tag::Strong if !metadata => {
                 strong = true;
                 None
             }
-            pulldown_cmark::Tag::Emphasis if !metadata && !table => {
+            pulldown_cmark::Tag::Emphasis if !metadata => {
                 emphasis = true;
                 None
             }
-            pulldown_cmark::Tag::Strikethrough if !metadata && !table => {
+            pulldown_cmark::Tag::Strikethrough if !metadata => {
                 strikethrough = true;
                 None
             }
-            pulldown_cmark::Tag::Link { dest_url, .. }
-                if !metadata && !table =>
-            {
+            pulldown_cmark::Tag::Link { dest_url, .. } if !metadata => {
                 match Url::parse(&dest_url) {
                     Ok(url)
                         if url.scheme() == "http"
@@ -584,13 +620,13 @@ fn parse_with<'a>(
             }
             pulldown_cmark::Tag::Image {
                 dest_url, title, ..
-            } if !metadata && !table => {
+            } if !metadata => {
                 image = Url::parse(&dest_url)
                     .ok()
                     .map(|url| (url, title.into_string()));
                 None
             }
-            pulldown_cmark::Tag::List(first_item) if !metadata && !table => {
+            pulldown_cmark::Tag::List(first_item) if !metadata => {
                 let prev = if spans.is_empty() {
                     None
                 } else {
@@ -616,7 +652,7 @@ fn parse_with<'a>(
 
                 None
             }
-            pulldown_cmark::Tag::BlockQuote(_kind) if !metadata && !table => {
+            pulldown_cmark::Tag::BlockQuote(_kind) if !metadata => {
                 let prev = if spans.is_empty() {
                     None
                 } else {
@@ -634,7 +670,7 @@ fn parse_with<'a>(
             }
             pulldown_cmark::Tag::CodeBlock(
                 pulldown_cmark::CodeBlockKind::Fenced(language),
-            ) if !metadata && !table => {
+            ) if !metadata => {
                 #[cfg(feature = "highlighter")]
                 {
                     highlighter = Some({
@@ -672,38 +708,54 @@ fn parse_with<'a>(
                 metadata = true;
                 None
             }
-            pulldown_cmark::Tag::Table(_) => {
-                table = true;
+            pulldown_cmark::Tag::Table(alignment) => {
+                stack.push(Scope::Table {
+                    columns: Vec::with_capacity(alignment.len()),
+                    alignment,
+                    current: Vec::new(),
+                    rows: Vec::new(),
+                });
+
+                None
+            }
+            pulldown_cmark::Tag::TableHead => {
+                strong = true;
+                None
+            }
+            pulldown_cmark::Tag::TableRow => {
+                let Scope::Table { rows, .. } = stack.last_mut()? else {
+                    return None;
+                };
+
+                rows.push(Row { cells: Vec::new() });
                 None
             }
             _ => None,
         },
         pulldown_cmark::Event::End(tag) => match tag {
-            pulldown_cmark::TagEnd::Heading(level) if !metadata && !table => {
-                produce(
-                    state.borrow_mut(),
-                    &mut stack,
-                    Item::Heading(level, Text::new(spans.drain(..).collect())),
-                    source,
-                )
-            }
-            pulldown_cmark::TagEnd::Strong if !metadata && !table => {
+            pulldown_cmark::TagEnd::Heading(level) if !metadata => produce(
+                state.borrow_mut(),
+                &mut stack,
+                Item::Heading(level, Text::new(spans.drain(..).collect())),
+                source,
+            ),
+            pulldown_cmark::TagEnd::Strong if !metadata => {
                 strong = false;
                 None
             }
-            pulldown_cmark::TagEnd::Emphasis if !metadata && !table => {
+            pulldown_cmark::TagEnd::Emphasis if !metadata => {
                 emphasis = false;
                 None
             }
-            pulldown_cmark::TagEnd::Strikethrough if !metadata && !table => {
+            pulldown_cmark::TagEnd::Strikethrough if !metadata => {
                 strikethrough = false;
                 None
             }
-            pulldown_cmark::TagEnd::Link if !metadata && !table => {
+            pulldown_cmark::TagEnd::Link if !metadata => {
                 link = None;
                 None
             }
-            pulldown_cmark::TagEnd::Paragraph if !metadata && !table => {
+            pulldown_cmark::TagEnd::Paragraph if !metadata => {
                 if spans.is_empty() {
                     None
                 } else {
@@ -715,7 +767,7 @@ fn parse_with<'a>(
                     )
                 }
             }
-            pulldown_cmark::TagEnd::Item if !metadata && !table => {
+            pulldown_cmark::TagEnd::Item if !metadata => {
                 if spans.is_empty() {
                     None
                 } else {
@@ -727,7 +779,7 @@ fn parse_with<'a>(
                     )
                 }
             }
-            pulldown_cmark::TagEnd::List(_) if !metadata && !table => {
+            pulldown_cmark::TagEnd::List(_) if !metadata => {
                 let scope = stack.pop()?;
 
                 let Scope::List(list) = scope else {
@@ -744,9 +796,7 @@ fn parse_with<'a>(
                     source,
                 )
             }
-            pulldown_cmark::TagEnd::BlockQuote(_kind)
-                if !metadata && !table =>
-            {
+            pulldown_cmark::TagEnd::BlockQuote(_kind) if !metadata => {
                 let scope = stack.pop()?;
 
                 let Scope::Quote(quote) = scope else {
@@ -760,7 +810,7 @@ fn parse_with<'a>(
                     source,
                 )
             }
-            pulldown_cmark::TagEnd::Image if !metadata && !table => {
+            pulldown_cmark::TagEnd::Image if !metadata => {
                 let (url, title) = image.take()?;
                 let alt = Text::new(spans.drain(..).collect());
 
@@ -774,7 +824,7 @@ fn parse_with<'a>(
                     source,
                 )
             }
-            pulldown_cmark::TagEnd::CodeBlock if !metadata && !table => {
+            pulldown_cmark::TagEnd::CodeBlock if !metadata => {
                 code_block = false;
 
                 #[cfg(feature = "highlighter")]
@@ -798,12 +848,60 @@ fn parse_with<'a>(
                 None
             }
             pulldown_cmark::TagEnd::Table => {
-                table = false;
+                let scope = stack.pop()?;
+
+                let Scope::Table { columns, rows, .. } = scope else {
+                    return None;
+                };
+
+                produce(
+                    state.borrow_mut(),
+                    &mut stack,
+                    Item::Table { columns, rows },
+                    source,
+                )
+            }
+            pulldown_cmark::TagEnd::TableHead => {
+                strong = false;
+                None
+            }
+            pulldown_cmark::TagEnd::TableCell => {
+                if !spans.is_empty() {
+                    let _ = produce(
+                        state.borrow_mut(),
+                        &mut stack,
+                        Item::Paragraph(Text::new(spans.drain(..).collect())),
+                        source,
+                    );
+                }
+
+                let Scope::Table {
+                    alignment,
+                    columns,
+                    rows,
+                    current,
+                } = stack.last_mut()?
+                else {
+                    return None;
+                };
+
+                if columns.len() < alignment.len() {
+                    columns.push(Column {
+                        header: std::mem::take(current),
+                        alignment: alignment[columns.len()],
+                    });
+                } else {
+                    rows.last_mut()
+                        .expect("table row")
+                        .cells
+                        .push(std::mem::take(current));
+                }
+
                 None
             }
             _ => None,
         },
-        pulldown_cmark::Event::Text(text) if !metadata && !table => {
+        pulldown_cmark::Event::Text(text) if !metadata => {
             if code_block {
                 code.push_str(&text);
 
@@ -844,7 +942,7 @@ fn parse_with<'a>(
 
             None
         }
-        pulldown_cmark::Event::Code(code) if !metadata && !table => {
+        pulldown_cmark::Event::Code(code) if !metadata => {
             let span = Span::Standard {
                 text: code.into_string(),
                 strong,
@@ -857,7 +955,7 @@ fn parse_with<'a>(
             spans.push(span);
             None
         }
-        pulldown_cmark::Event::SoftBreak if !metadata && !table => {
+        pulldown_cmark::Event::SoftBreak if !metadata => {
             spans.push(Span::Standard {
                 text: String::from(" "),
                 strikethrough,
@@ -868,7 +966,7 @@ fn parse_with<'a>(
             });
             None
         }
-        pulldown_cmark::Event::HardBreak if !metadata && !table => {
+        pulldown_cmark::Event::HardBreak if !metadata => {
             spans.push(Span::Standard {
                 text: String::from("\n"),
                 strikethrough,
@@ -1113,6 +1211,7 @@ where
         } => viewer.ordered_list(settings, *start, items),
         Item::Quote(quote) => viewer.quote(settings, quote),
         Item::Rule => viewer.rule(settings),
+        Item::Table { columns, rows } => viewer.table(settings, columns, rows),
     }
 }
 
@@ -1313,6 +1412,74 @@ where
     horizontal_rule(2).into()
 }
 
+/// Displays a table using the default look.
+pub fn table<'a, Message, Theme, Renderer>(
+    viewer: &impl Viewer<'a, Message, Theme, Renderer>,
+    settings: Settings,
+    columns: &'a [Column],
+    rows: &'a [Row],
+) -> Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    use crate::table;
+
+    table(
+        columns.iter().enumerate().map(move |(i, column)| {
+            table::column(
+                items(viewer, settings, &column.header),
+                move |row: &Row| {
+                    if let Some(cells) = row.cells.get(i) {
+                        items(viewer, settings, cells)
+                    } else {
+                        text("").into()
+                    }
+                },
+            )
+            .align_x(match column.alignment {
+                pulldown_cmark::Alignment::None
+                | pulldown_cmark::Alignment::Left => {
+                    alignment::Horizontal::Left
+                }
+                pulldown_cmark::Alignment::Center => {
+                    alignment::Horizontal::Center
+                }
+                pulldown_cmark::Alignment::Right => {
+                    alignment::Horizontal::Right
+                }
+            })
+        }),
+        rows,
+    )
+    .padding_x(settings.spacing.0)
+    .padding_y(settings.spacing.0 / 2.0)
+    .separator_x(0)
+    .into()
+}
+
+/// Displays a column of items with the default look.
+pub fn items<'a, Message, Theme, Renderer>(
+    viewer: &impl Viewer<'a, Message, Theme, Renderer>,
+    settings: Settings,
+    items: &'a [Item],
+) -> Element<'a, Message, Theme, Renderer>
+where
+    Message: 'a,
+    Theme: Catalog + 'a,
+    Renderer: core::text::Renderer<Font = Font> + 'a,
+{
+    column(
+        items
+            .iter()
+            .enumerate()
+            .map(|(i, content)| item(viewer, settings, content, i)),
+    )
+    .spacing(settings.spacing.0)
+    .into()
+}
+
 /// A view strategy to display a Markdown [`Item`].
 pub trait Viewer<'a, Message, Theme = crate::Theme, Renderer = crate::Renderer>
 where
@@ -1429,6 +1596,18 @@ where
     ) -> Element<'a, Message, Theme, Renderer> {
         rule()
     }
+
+    /// Displays a table.
+    ///
+    /// By default, it calls [`table`].
+    fn table(
+        &self,
+        settings: Settings,
+        columns: &'a [Column],
+        rows: &'a [Row],
+    ) -> Element<'a, Message, Theme, Renderer> {
+        table(self, settings, columns, rows)
+    }
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -1446,7 +1625,11 @@ where
 
 /// The theme catalog of Markdown items.
 pub trait Catalog:
-    container::Catalog + scrollable::Catalog + rule::Catalog + text::Catalog
+    container::Catalog
+    + scrollable::Catalog
+    + rule::Catalog
+    + text::Catalog
+    + crate::table::Catalog
 {
     /// The styling class of a Markdown code block.
     fn code_block<'a>() -> <Self as container::Catalog>::Class<'a>;
diff --git a/widget/src/table.rs b/widget/src/table.rs
index 32c94956..e03f31cf 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -10,8 +10,8 @@ use crate::core::{
     Widget,
 };
 
-pub fn table<'a, T, Message, Theme, Renderer>(
-    columns: impl IntoIterator<Item = Column<'a, T, Message, Theme, Renderer>>,
+pub fn table<'a, 'b, T, Message, Theme, Renderer>(
+    columns: impl IntoIterator<Item = Column<'a, 'b, T, Message, Theme, Renderer>>,
     rows: impl IntoIterator<Item = T>,
 ) -> Table<'a, Message, Theme, Renderer>
 where
@@ -22,10 +22,10 @@ where
     Table::new(columns, rows)
 }
 
-pub fn column<'a, T, E, Message, Theme, Renderer>(
+pub fn column<'a, 'b, T, E, Message, Theme, Renderer>(
     header: impl Into<Element<'a, Message, Theme, Renderer>>,
-    view: impl Fn(T) -> E + 'a,
-) -> Column<'a, T, Message, Theme, Renderer>
+    view: impl Fn(T) -> E + 'b,
+) -> Column<'a, 'b, T, Message, Theme, Renderer>
 where
     T: 'a,
     E: Into<Element<'a, Message, Theme, Renderer>>,
@@ -65,8 +65,10 @@ where
     Theme: Catalog,
     Renderer: core::Renderer,
 {
-    pub fn new<T>(
-        columns: impl IntoIterator<Item = Column<'a, T, Message, Theme, Renderer>>,
+    pub fn new<'b, T>(
+        columns: impl IntoIterator<
+            Item = Column<'a, 'b, T, Message, Theme, Renderer>,
+        >,
         rows: impl IntoIterator<Item = T>,
     ) -> Self
     where
@@ -122,7 +124,7 @@ where
             width,
             height,
             padding_x: 10.0,
-            padding_y: 10.0,
+            padding_y: 5.0,
             separator_x: 1.0,
             separator_y: 1.0,
             class: Theme::default(),
@@ -526,19 +528,22 @@ where
 
 pub struct Column<
     'a,
+    'b,
     T,
     Message,
     Theme = crate::Theme,
     Renderer = crate::Renderer,
 > {
     header: Element<'a, Message, Theme, Renderer>,
-    view: Box<dyn Fn(T) -> Element<'a, Message, Theme, Renderer> + 'a>,
+    view: Box<dyn Fn(T) -> Element<'a, Message, Theme, Renderer> + 'b>,
     width: Length,
     align_x: alignment::Horizontal,
     align_y: alignment::Vertical,
 }
 
-impl<'a, T, Message, Theme, Renderer> Column<'a, T, Message, Theme, Renderer> {
+impl<'a, 'b, T, Message, Theme, Renderer>
+    Column<'a, 'b, T, Message, Theme, Renderer>
+{
     pub fn width(mut self, width: impl Into<Length>) -> Self {
         self.width = width.into();
         self

From e0d9078334de3d46fdc8523684114b45356a54ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Fri, 18 Jul 2025 03:53:59 +0200
Subject: [PATCH 09/43] Implement `From<Option<T>>` for `Element`

---
 core/src/element.rs             | 46 +++++++++++++++++++++++++++++++++
 core/src/length.rs              |  1 +
 core/src/size.rs                | 11 +++++++-
 examples/pane_grid/src/main.rs  | 18 ++++++-------
 examples/qr_code/src/main.rs    | 22 ++++++++--------
 examples/screenshot/src/main.rs | 20 +++++++-------
 examples/tour/src/main.rs       | 22 ++++++++--------
 widget/src/column.rs            | 22 +++++-----------
 widget/src/row.rs               | 22 +++++-----------
 9 files changed, 110 insertions(+), 74 deletions(-)

diff --git a/core/src/element.rs b/core/src/element.rs
index 9d083d79..a3f60127 100644
--- a/core/src/element.rs
+++ b/core/src/element.rs
@@ -532,3 +532,49 @@ where
         )
     }
 }
+
+impl<'a, T, Message, Theme, Renderer> From<Option<T>>
+    for Element<'a, Message, Theme, Renderer>
+where
+    T: Into<Self>,
+    Renderer: crate::Renderer,
+{
+    fn from(element: Option<T>) -> Self {
+        struct Void;
+
+        impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer> for Void
+        where
+            Renderer: crate::Renderer,
+        {
+            fn size(&self) -> Size<Length> {
+                Size {
+                    width: Length::Fixed(0.0),
+                    height: Length::Fixed(0.0),
+                }
+            }
+
+            fn layout(
+                &self,
+                _tree: &mut Tree,
+                _renderer: &Renderer,
+                _limits: &layout::Limits,
+            ) -> layout::Node {
+                layout::Node::new(Size::ZERO)
+            }
+
+            fn draw(
+                &self,
+                _tree: &Tree,
+                _renderer: &mut Renderer,
+                _theme: &Theme,
+                _style: &renderer::Style,
+                _layout: Layout<'_>,
+                _cursor: mouse::Cursor,
+                _viewport: &Rectangle,
+            ) {
+            }
+        }
+
+        element.map(T::into).unwrap_or_else(|| Element::new(Void))
+    }
+}
diff --git a/core/src/length.rs b/core/src/length.rs
index 363833c4..073465ae 100644
--- a/core/src/length.rs
+++ b/core/src/length.rs
@@ -57,6 +57,7 @@ impl Length {
 
     /// Adapts the [`Length`] so it can contain the other [`Length`] and
     /// match its fluidity.
+    #[inline]
     pub fn enclose(self, other: Length) -> Self {
         match (self, other) {
             (Length::Shrink, Length::Fill | Length::FillPortion(_)) => other,
diff --git a/core/src/size.rs b/core/src/size.rs
index 95089236..9503cf59 100644
--- a/core/src/size.rs
+++ b/core/src/size.rs
@@ -1,4 +1,4 @@
-use crate::{Radians, Vector};
+use crate::{Length, Radians, Vector};
 
 /// An amount of space in 2 dimensions.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
@@ -66,6 +66,15 @@ impl Size {
     }
 }
 
+impl Size<Length> {
+    /// Returns true if either `width` or `height` are 0-sized.
+    #[inline]
+    pub fn is_void(&self) -> bool {
+        matches!(self.width, Length::Fixed(0.0))
+            || matches!(self.height, Length::Fixed(0.0))
+    }
+}
+
 impl<T> From<[T; 2]> for Size<T> {
     fn from([width, height]: [T; 2]) -> Self {
         Size { width, height }
diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index c44fc1f1..2d2b92d9 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -276,13 +276,13 @@ fn view_content<'a>(
         button(
             "Split vertically",
             Message::Split(pane_grid::Axis::Vertical, pane),
-        )
+        ),
+        if total_panes > 1 && !is_pinned {
+            Some(button("Close", Message::Close(pane)).style(button::danger))
+        } else {
+            None
+        }
     ]
-    .push_maybe(if total_panes > 1 && !is_pinned {
-        Some(button("Close", Message::Close(pane)).style(button::danger))
-    } else {
-        None
-    })
     .spacing(5)
     .max_width(160);
 
@@ -300,7 +300,7 @@ fn view_controls<'a>(
     is_pinned: bool,
     is_maximized: bool,
 ) -> Element<'a, Message> {
-    let row = row![].spacing(5).push_maybe(if total_panes > 1 {
+    let maximize = if total_panes > 1 {
         let (content, message) = if is_maximized {
             ("Restore", Message::Restore)
         } else {
@@ -315,7 +315,7 @@ fn view_controls<'a>(
         )
     } else {
         None
-    });
+    };
 
     let close = button(text("Close").size(14))
         .style(button::danger)
@@ -326,7 +326,7 @@ fn view_controls<'a>(
             None
         });
 
-    row.push(close).into()
+    row![maximize, close].spacing(5).into()
 }
 
 mod style {
diff --git a/examples/qr_code/src/main.rs b/examples/qr_code/src/main.rs
index 20217615..6b6989d0 100644
--- a/examples/qr_code/src/main.rs
+++ b/examples/qr_code/src/main.rs
@@ -88,18 +88,18 @@ impl QRGenerator {
             input,
             row![toggle_total_size, choose_theme]
                 .spacing(20)
-                .align_y(Center)
+                .align_y(Center),
+            self.total_size.map(|total_size| {
+                slider(Self::SIZE_RANGE, total_size, Message::TotalSizeChanged)
+            }),
+            self.qr_code.as_ref().map(|data| {
+                if let Some(total_size) = self.total_size {
+                    qr_code(data).total_size(total_size)
+                } else {
+                    qr_code(data).cell_size(10.0)
+                }
+            })
         ]
-        .push_maybe(self.total_size.map(|total_size| {
-            slider(Self::SIZE_RANGE, total_size, Message::TotalSizeChanged)
-        }))
-        .push_maybe(self.qr_code.as_ref().map(|data| {
-            if let Some(total_size) = self.total_size {
-                qr_code(data).total_size(total_size)
-            } else {
-                qr_code(data).cell_size(10.0)
-            }
-        }))
         .width(700)
         .spacing(20)
         .align_x(Center);
diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 1f18e285..61285b72 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -158,15 +158,15 @@ impl Example {
         .spacing(10)
         .align_y(Center);
 
-        let crop_controls =
-            column![crop_origin_controls, crop_dimension_controls]
-                .push_maybe(
-                    self.crop_error
-                        .as_ref()
-                        .map(|error| text!("Crop error! \n{error}")),
-                )
-                .spacing(10)
-                .align_x(Center);
+        let crop_controls = column![
+            crop_origin_controls,
+            crop_dimension_controls,
+            self.crop_error
+                .as_ref()
+                .map(|error| text!("Crop error! \n{error}")),
+        ]
+        .spacing(10)
+        .align_x(Center);
 
         let controls = {
             let save_result =
@@ -208,8 +208,8 @@ impl Example {
                 ]
                 .spacing(10)
                 .align_x(Center),
+                save_result.map(text)
             ]
-            .push_maybe(save_result.map(text))
             .spacing(40)
         };
 
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 984cf272..5d009da6 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -142,17 +142,17 @@ impl Tour {
     }
 
     fn view(&self) -> Element<'_, Message> {
-        let controls =
-            row![]
-                .push_maybe(self.screen.previous().is_some().then(|| {
-                    padded_button("Back")
-                        .on_press(Message::BackPressed)
-                        .style(button::secondary)
-                }))
-                .push(horizontal_space())
-                .push_maybe(self.can_continue().then(|| {
-                    padded_button("Next").on_press(Message::NextPressed)
-                }));
+        let controls = row![
+            self.screen.previous().is_some().then(|| {
+                padded_button("Back")
+                    .on_press(Message::BackPressed)
+                    .style(button::secondary)
+            }),
+            horizontal_space(),
+            self.can_continue().then(|| {
+                padded_button("Next").on_press(Message::NextPressed)
+            })
+        ];
 
         let screen = match self.screen {
             Screen::Welcome => self.welcome(),
diff --git a/widget/src/column.rs b/widget/src/column.rs
index 4ab56c89..6c126048 100644
--- a/widget/src/column.rs
+++ b/widget/src/column.rs
@@ -145,23 +145,13 @@ where
         let child = child.into();
         let child_size = child.as_widget().size_hint();
 
-        self.width = self.width.enclose(child_size.width);
-        self.height = self.height.enclose(child_size.height);
-
-        self.children.push(child);
-        self
-    }
-
-    /// Adds an element to the [`Column`], if `Some`.
-    pub fn push_maybe(
-        self,
-        child: Option<impl Into<Element<'a, Message, Theme, Renderer>>>,
-    ) -> Self {
-        if let Some(child) = child {
-            self.push(child)
-        } else {
-            self
+        if !child_size.is_void() {
+            self.width = self.width.enclose(child_size.width);
+            self.height = self.height.enclose(child_size.height);
+            self.children.push(child);
         }
+
+        self
     }
 
     /// Extends the [`Column`] with the given children.
diff --git a/widget/src/row.rs b/widget/src/row.rs
index a51106d1..7bd8799f 100644
--- a/widget/src/row.rs
+++ b/widget/src/row.rs
@@ -136,23 +136,13 @@ where
         let child = child.into();
         let child_size = child.as_widget().size_hint();
 
-        self.width = self.width.enclose(child_size.width);
-        self.height = self.height.enclose(child_size.height);
-
-        self.children.push(child);
-        self
-    }
-
-    /// Adds an element to the [`Row`], if `Some`.
-    pub fn push_maybe(
-        self,
-        child: Option<impl Into<Element<'a, Message, Theme, Renderer>>>,
-    ) -> Self {
-        if let Some(child) = child {
-            self.push(child)
-        } else {
-            self
+        if !child_size.is_void() {
+            self.width = self.width.enclose(child_size.width);
+            self.height = self.height.enclose(child_size.height);
+            self.children.push(child);
         }
+
+        self
     }
 
     /// Extends the [`Row`] with the given children.

From 729a09fa4e9ec6f5a3671c56ec52ad0eb9cab6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Fri, 18 Jul 2025 21:21:07 +0200
Subject: [PATCH 10/43] Write documentation for `table`

---
 widget/src/table.rs | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/widget/src/table.rs b/widget/src/table.rs
index e03f31cf..c3ce0879 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -1,4 +1,4 @@
-#![allow(missing_docs, missing_debug_implementations)]
+//! Display tables.
 use crate::core;
 use crate::core::alignment;
 use crate::core::layout;
@@ -10,6 +10,10 @@ use crate::core::{
     Widget,
 };
 
+/// Creates a new [`Table`] with the given columns and rows.
+///
+/// Columns can be created using the [`column`] function, while rows can be any
+/// iterator over some data type `T`.
 pub fn table<'a, 'b, T, Message, Theme, Renderer>(
     columns: impl IntoIterator<Item = Column<'a, 'b, T, Message, Theme, Renderer>>,
     rows: impl IntoIterator<Item = T>,
@@ -22,6 +26,10 @@ where
     Table::new(columns, rows)
 }
 
+/// Creates a new [`Column`] with the given header and view function.
+///
+/// The view function will be called for each row in a [`Table`] and it must
+/// produce the resulting contents of a cell.
 pub fn column<'a, 'b, T, E, Message, Theme, Renderer>(
     header: impl Into<Element<'a, Message, Theme, Renderer>>,
     view: impl Fn(T) -> E + 'b,
@@ -39,6 +47,8 @@ where
     }
 }
 
+/// A grid-like visual representation of data of columns and rows.
+#[allow(missing_debug_implementations)]
 pub struct Table<'a, Message, Theme = crate::Theme, Renderer = crate::Renderer>
 where
     Theme: Catalog,
@@ -65,6 +75,10 @@ where
     Theme: Catalog,
     Renderer: core::Renderer,
 {
+    /// Creates a new [`Table`] with the given columns and rows.
+    ///
+    /// Columns can be created using the [`column`] function, while rows can be any
+    /// iterator over some data type `T`.
     pub fn new<'b, T>(
         columns: impl IntoIterator<
             Item = Column<'a, 'b, T, Message, Theme, Renderer>,
@@ -131,38 +145,45 @@ where
         }
     }
 
+    /// Sets the width of the [`Table`].
     pub fn width(mut self, width: impl Into<Length>) -> Self {
         self.width = width.into();
         self
     }
 
+    /// Sets the padding of the cells of the [`Table`].
     pub fn padding(self, padding: impl Into<Pixels>) -> Self {
         let padding = padding.into();
 
         self.padding_x(padding).padding_y(padding)
     }
 
+    /// Sets the horizontal padding of the cells of the [`Table`].
     pub fn padding_x(mut self, padding: impl Into<Pixels>) -> Self {
         self.padding_x = padding.into().0;
         self
     }
 
+    /// Sets the vertical padding of the cells of the [`Table`].
     pub fn padding_y(mut self, padding: impl Into<Pixels>) -> Self {
         self.padding_y = padding.into().0;
         self
     }
 
+    /// Sets the thickness of the line separator between the cells of the [`Table`].
     pub fn separator(self, separator: impl Into<Pixels>) -> Self {
         let separator = separator.into();
 
         self.separator_x(separator).separator_y(separator)
     }
 
+    /// Sets the thickness of the horizontal line separator between the cells of the [`Table`].
     pub fn separator_x(mut self, separator: impl Into<Pixels>) -> Self {
         self.separator_x = separator.into().0;
         self
     }
 
+    /// Sets the thickness of the vertical line separator between the cells of the [`Table`].
     pub fn separator_y(mut self, separator: impl Into<Pixels>) -> Self {
         self.separator_y = separator.into().0;
         self
@@ -526,6 +547,8 @@ where
     }
 }
 
+/// A vertical visualization of some data with a header.
+#[allow(missing_debug_implementations)]
 pub struct Column<
     'a,
     'b,
@@ -544,6 +567,7 @@ pub struct Column<
 impl<'a, 'b, T, Message, Theme, Renderer>
     Column<'a, 'b, T, Message, Theme, Renderer>
 {
+    /// Sets the width of the [`Column`].
     pub fn width(mut self, width: impl Into<Length>) -> Self {
         self.width = width.into();
         self
@@ -568,9 +592,12 @@ impl<'a, 'b, T, Message, Theme, Renderer>
     }
 }
 
+/// The appearance of a [`Table`].
 #[derive(Debug, Clone, Copy)]
 pub struct Style {
+    /// The background color of the horizontal line separator between cells.
     pub separator_x: Background,
+    /// The background color of the vertical line separator between cells.
     pub separator_y: Background,
 }
 

From 420de7150d8a139f0c3374051b036bc789837f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Fri, 18 Jul 2025 21:22:21 +0200
Subject: [PATCH 11/43] Clarify description of `Table` in docs

---
 widget/src/table.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/widget/src/table.rs b/widget/src/table.rs
index c3ce0879..373f93cc 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -12,7 +12,7 @@ use crate::core::{
 
 /// Creates a new [`Table`] with the given columns and rows.
 ///
-/// Columns can be created using the [`column`] function, while rows can be any
+/// Columns can be created using the [`column()`] function, while rows can be any
 /// iterator over some data type `T`.
 pub fn table<'a, 'b, T, Message, Theme, Renderer>(
     columns: impl IntoIterator<Item = Column<'a, 'b, T, Message, Theme, Renderer>>,
@@ -47,7 +47,7 @@ where
     }
 }
 
-/// A grid-like visual representation of data of columns and rows.
+/// A grid-like visual representation of data distributed in columns and rows.
 #[allow(missing_debug_implementations)]
 pub struct Table<'a, Message, Theme = crate::Theme, Renderer = crate::Renderer>
 where
@@ -77,7 +77,7 @@ where
 {
     /// Creates a new [`Table`] with the given columns and rows.
     ///
-    /// Columns can be created using the [`column`] function, while rows can be any
+    /// Columns can be created using the [`column()`] function, while rows can be any
     /// iterator over some data type `T`.
     pub fn new<'b, T>(
         columns: impl IntoIterator<

From 195146b50c53ee5df1f17150a5aa32ba24ed7d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 22 Jul 2025 02:50:42 +0200
Subject: [PATCH 12/43] Update `wgpu` to `26`

---
 Cargo.lock                                   | 723 ++++++++++---------
 Cargo.toml                                   |   4 +-
 benches/wgpu.rs                              |  13 +-
 examples/custom_shader/src/scene/pipeline.rs |   2 +
 examples/integration/src/main.rs             |  19 +-
 examples/integration/src/scene.rs            |   1 +
 wgpu/src/color.rs                            |   1 +
 wgpu/src/lib.rs                              |  28 +-
 wgpu/src/triangle.rs                         |   1 +
 wgpu/src/triangle/msaa.rs                    |   2 +
 wgpu/src/window/compositor.rs                |  28 +-
 11 files changed, 436 insertions(+), 386 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 88e4ef2b..0248b85e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 4
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.29"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0"
+checksum = "e074464580a518d16a7126262fffaaa47af89d4099d4cb403f8ed938ba12ee7d"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -14,9 +14,9 @@ dependencies = [
 
 [[package]]
 name = "ab_glyph_rasterizer"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
+checksum = "b2187590a23ab1e3df8681afdf0987c48504d80291f002fcdb651f0ef5e25169"
 
 [[package]]
 name = "addr2line"
@@ -29,9 +29,9 @@ dependencies = [
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "ahash"
@@ -63,9 +63,12 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
 
 [[package]]
 name = "aligned-vec"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"
+dependencies = [
+ "equator",
+]
 
 [[package]]
 name = "android-activity"
@@ -83,7 +86,7 @@ dependencies = [
  "log",
  "ndk",
  "ndk-context",
- "ndk-sys 0.6.0+11769913",
+ "ndk-sys",
  "num_enum",
  "thiserror 1.0.69",
 ]
@@ -117,9 +120,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anyhow"
@@ -230,9 +233,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.3.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
 dependencies = [
  "concurrent-queue",
  "event-listener-strategy",
@@ -256,9 +259,9 @@ dependencies = [
 
 [[package]]
 name = "async-fs"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+checksum = "09f7e37c0ed80b2a977691c47dae8625cfb21e205827106c64f7c588766b2e50"
 dependencies = [
  "async-lock",
  "blocking",
@@ -271,7 +274,7 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.5.0",
  "async-executor",
  "async-io",
  "async-lock",
@@ -282,9 +285,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1237c0ae75a0f3765f58910ff9cdd0a12eeb39ab2f4c7de23262f337f0aacbb3"
+checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
 dependencies = [
  "async-lock",
  "cfg-if",
@@ -293,10 +296,9 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix 1.0.7",
+ "rustix 1.0.8",
  "slab",
- "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -323,11 +325,11 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde3f4e40e6021d7acffc90095cbd6dc54cb593903d1de5832f435eb274b85dc"
+checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.5.0",
  "async-io",
  "async-lock",
  "async-signal",
@@ -336,8 +338,7 @@ dependencies = [
  "cfg-if",
  "event-listener 5.4.0",
  "futures-lite",
- "rustix 1.0.7",
- "tracing",
+ "rustix 1.0.8",
 ]
 
 [[package]]
@@ -353,9 +354,9 @@ dependencies = [
 
 [[package]]
 name = "async-signal"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7605a4e50d4b06df3898d5a70bf5fde51ed9059b0434b73105193bc27acce0d"
+checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1"
 dependencies = [
  "async-io",
  "async-lock",
@@ -363,10 +364,10 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 1.0.7",
+ "rustix 1.0.8",
  "signal-hook-registry",
  "slab",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -449,9 +450,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "av1-grain"
@@ -469,9 +470,9 @@ dependencies = [
 
 [[package]]
 name = "avif-serialize"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98922d6a4cfbcb08820c69d8eeccc05bb1f29bfa06b4f5b1dbfe9a868bd7608e"
+checksum = "2ea8ef51aced2b9191c08197f55450d830876d9933f8f48a429b354f1d496b42"
 dependencies = [
  "arrayvec",
 ]
@@ -607,11 +608,11 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.6.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.5.0",
  "async-task",
  "futures-io",
  "futures-lite",
@@ -632,9 +633,9 @@ checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b"
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "by_address"
@@ -644,18 +645,18 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
+checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.9.3"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1"
+checksum = "441473f2b4b0459a68628c744bc61d23e730fb00128b841d30fa4bb3972257e4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -741,9 +742,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.24"
+version = "1.2.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
+checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
 dependencies = [
  "jobserver",
  "libc",
@@ -768,9 +769,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "cfg_aliases"
@@ -842,18 +843,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.39"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.39"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -861,15 +862,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "clipboard-win"
-version = "5.4.0"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
+checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
 dependencies = [
  "error-code",
 ]
@@ -915,10 +916,11 @@ dependencies = [
 
 [[package]]
 name = "codespan-reporting"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
+ "serde",
  "termcolor",
  "unicode-width",
 ]
@@ -1099,9 +1101,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -1169,14 +1171,14 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "cryoglyph"
 version = "0.1.0"
-source = "git+https://github.com/iced-rs/cryoglyph.git?rev=a456d1c17bbcf33afcca41d9e5e299f9f1193819#a456d1c17bbcf33afcca41d9e5e299f9f1193819"
+source = "git+https://github.com/iced-rs/cryoglyph.git?rev=453cedec0d2ec563bd7fa87e84a2319bcebb1ba3#453cedec0d2ec563bd7fa87e84a2319bcebb1ba3"
 dependencies = [
  "cosmic-text",
  "etagere",
@@ -1295,7 +1297,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1423,9 +1425,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
 
 [[package]]
 name = "enumflags2"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -1433,9 +1435,29 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "equator"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1450,12 +1472,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1569,9 +1591,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1885,9 +1907,9 @@ dependencies = [
 
 [[package]]
 name = "getopts"
-version = "0.2.21"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"
 dependencies = [
  "unicode-width",
 ]
@@ -1901,7 +1923,7 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
@@ -1919,9 +1941,9 @@ dependencies = [
 
 [[package]]
 name = "gif"
-version = "0.13.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b"
 dependencies = [
  "color_quant",
  "weezl",
@@ -2109,9 +2131,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
 dependencies = [
  "bytes",
  "fnv",
@@ -2128,9 +2150,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
+checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2153,13 +2175,14 @@ checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
  "cfg-if",
  "crunchy",
+ "num-traits",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.15.3"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
  "foldhash",
 ]
@@ -2202,15 +2225,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hex"
@@ -2224,15 +2241,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
-[[package]]
-name = "home"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "http"
 version = "0.2.12"
@@ -2311,7 +2319,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.26",
+ "h2 0.3.27",
  "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
@@ -2334,7 +2342,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.10",
+ "h2 0.4.11",
  "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
@@ -2347,14 +2355,14 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.6"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a01595e11bdcec50946522c32dde3fc6914743000a68b93000965f2f02406d"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
  "http 1.3.1",
  "hyper 1.6.0",
  "hyper-util",
- "rustls 0.23.27",
+ "rustls 0.23.29",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.2",
@@ -2379,9 +2387,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.13"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8"
+checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -2787,9 +2795,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
+checksum = "f6970fe7a5300b4b42e62c52efa0187540a5bef546c60edaf554ef595d2e6f0b"
 dependencies = [
  "byteorder-lite",
  "quick-error",
@@ -2809,9 +2817,9 @@ checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -2843,6 +2851,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "io-uring"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
+dependencies = [
+ "bitflags 2.9.1",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -2874,7 +2893,7 @@ version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
- "hermit-abi 0.5.1",
+ "hermit-abi",
  "libc",
  "windows-sys 0.59.0",
 ]
@@ -2947,9 +2966,9 @@ dependencies = [
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07"
 
 [[package]]
 name = "js-sys"
@@ -2999,11 +3018,12 @@ dependencies = [
 
 [[package]]
 name = "kurbo"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1077d333efea6170d9ccb96d3c3026f300ca0773da4938cc4c811daa6df68b0c"
+checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62"
 dependencies = [
  "arrayvec",
+ "euclid",
  "smallvec",
 ]
 
@@ -3044,15 +3064,15 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
 dependencies = [
  "arbitrary",
  "cc",
@@ -3065,7 +3085,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.0",
+ "windows-targets 0.53.2",
 ]
 
 [[package]]
@@ -3076,13 +3096,13 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
- "redox_syscall 0.5.12",
+ "redox_syscall 0.5.15",
 ]
 
 [[package]]
@@ -3175,9 +3195,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.12.5"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed"
 
 [[package]]
 name = "lyon"
@@ -3272,9 +3292,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memfd"
@@ -3287,9 +3307,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.9.5"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28"
 dependencies = [
  "libc",
 ]
@@ -3305,13 +3325,13 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e"
+checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
 dependencies = [
  "bitflags 2.9.1",
  "block",
- "core-graphics-types 0.1.3",
+ "core-graphics-types 0.2.0",
  "foreign-types 0.5.0",
  "log",
  "objc",
@@ -3342,9 +3362,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -3357,7 +3377,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi 0.11.1+wasi-snapshot-preview1",
  "windows-sys 0.59.0",
 ]
 
@@ -3410,24 +3430,28 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
 
 [[package]]
 name = "naga"
-version = "24.0.0"
+version = "26.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e"
+checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c"
 dependencies = [
  "arrayvec",
  "bit-set",
  "bitflags 2.9.1",
+ "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
+ "half",
+ "hashbrown",
  "hexf-parse",
  "indexmap",
+ "libm",
  "log",
+ "num-traits",
+ "once_cell",
  "rustc-hash 1.1.0",
  "spirv",
- "strum",
- "termcolor",
  "thiserror 2.0.12",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -3456,7 +3480,7 @@ dependencies = [
  "bitflags 2.9.1",
  "jni-sys",
  "log",
- "ndk-sys 0.6.0+11769913",
+ "ndk-sys",
  "num_enum",
  "raw-window-handle 0.6.2",
  "thiserror 1.0.69",
@@ -3468,15 +3492,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
-[[package]]
-name = "ndk-sys"
-version = "0.5.0+25.2.9519653"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
-dependencies = [
- "jni-sys",
-]
-
 [[package]]
 name = "ndk-sys"
 version = "0.6.0+11769913"
@@ -3599,28 +3614,29 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
 dependencies = [
  "num_enum_derive",
+ "rustversion",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -3994,9 +4010,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "4.6.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
+checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01"
 dependencies = [
  "num-traits",
 ]
@@ -4117,7 +4133,7 @@ checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.12",
+ "redox_syscall 0.5.15",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -4246,13 +4262,13 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "plist"
-version = "1.7.1"
+version = "1.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac26e981c03a6e53e0aee43c113e3202f5581d5360dae7bd2c70e800dd0451d"
+checksum = "3af6b589e163c5a788fab00ce0c0366f6efbb9959c2f9874b224936af7fce7e1"
 dependencies = [
  "base64 0.22.1",
  "indexmap",
- "quick-xml 0.32.0",
+ "quick-xml 0.38.0",
  "serde",
  "time",
 ]
@@ -4312,17 +4328,31 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.8.0"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b53a684391ad002dd6a596ceb6c74fd004fdce75f4be2e3f615068abbea5fd50"
+checksum = "8ee9b2fa7a4517d2c91ff5bc6c297a427a96749d15f98fcdbb22c05571a4d4b7"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.5.1",
+ "hermit-abi",
  "pin-project-lite",
- "rustix 1.0.7",
- "tracing",
- "windows-sys 0.59.0",
+ "rustix 1.0.8",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
 ]
 
 [[package]]
@@ -4388,18 +4418,18 @@ dependencies = [
 
 [[package]]
 name = "profiling"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
+checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
 dependencies = [
  "profiling-procmacros",
 ]
 
 [[package]]
 name = "profiling-procmacros"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
+checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b"
 dependencies = [
  "quote",
  "syn",
@@ -4461,18 +4491,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.32.0"
+version = "0.37.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quick-xml"
-version = "0.37.5"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+checksum = "8927b0664f5c5a98265138b7e3f90aa19a6b21353182469ace36d4ac527b7b1b"
 dependencies = [
  "memchr",
 ]
@@ -4488,9 +4518,9 @@ dependencies = [
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rand"
@@ -4505,9 +4535,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
@@ -4600,9 +4630,9 @@ dependencies = [
 
 [[package]]
 name = "ravif"
-version = "0.11.12"
+version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6a5f31fcf7500f9401fea858ea4ab5525c99f2322cfcee732c0e6c74208c0c6"
+checksum = "5825c26fddd16ab9f515930d49028a630efec172e903483c94796cfe31893e6b"
 dependencies = [
  "avif-serialize",
  "imgref",
@@ -4647,9 +4677,9 @@ dependencies = [
 
 [[package]]
 name = "read-fonts"
-version = "0.29.2"
+version = "0.29.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f96bfbb7df43d34a2b7b8582fcbcb676ba02a763265cb90bc8aabfd62b57d64"
+checksum = "04ca636dac446b5664bd16c069c00a9621806895b8bb02c2dc68542b23b8f25d"
 dependencies = [
  "bytemuck",
  "font-types",
@@ -4666,9 +4696,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.12"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec"
 dependencies = [
  "bitflags 2.9.1",
 ]
@@ -4721,16 +4751,16 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
 [[package]]
 name = "reqwest"
-version = "0.12.18"
+version = "0.12.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e98ff6b0dbbe4d5a37318f433d4fc82babd21631f194d370409ceb2e40b2f0b5"
+checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.10",
+ "h2 0.4.11",
  "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
@@ -4738,12 +4768,10 @@ dependencies = [
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
  "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "rustls-pki-types",
@@ -4805,9 +4833,9 @@ dependencies = [
 
 [[package]]
 name = "rgb"
-version = "0.8.50"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
+checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
 dependencies = [
  "bytemuck",
 ]
@@ -4834,9 +4862,9 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
 [[package]]
 name = "rustc-hash"
@@ -4865,15 +4893,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
 dependencies = [
  "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4892,13 +4920,13 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.27"
+version = "0.23.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
+checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
- "rustls-webpki 0.103.3",
+ "rustls-webpki 0.103.4",
  "subtle",
  "zeroize",
 ]
@@ -4925,9 +4953,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.3"
+version = "0.103.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
+checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -5083,9 +5111,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
 dependencies = [
  "itoa",
  "memchr",
@@ -5106,9 +5134,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
  "serde",
 ]
@@ -5231,12 +5259,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "slider"
@@ -5256,9 +5281,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -5302,7 +5327,7 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f"
 dependencies = [
- "async-channel 2.3.1",
+ "async-channel 2.5.0",
  "async-executor",
  "async-fs",
  "async-io",
@@ -5352,7 +5377,7 @@ dependencies = [
  "objc2-foundation 0.2.2",
  "objc2-quartz-core",
  "raw-window-handle 0.6.2",
- "redox_syscall 0.5.12",
+ "redox_syscall 0.5.15",
  "rustix 0.38.44",
  "tiny-xlib",
  "wasm-bindgen",
@@ -5416,28 +5441,6 @@ dependencies = [
  "float-cmp",
 ]
 
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
-]
-
 [[package]]
 name = "styling"
 version = "0.1.0"
@@ -5449,9 +5452,9 @@ dependencies = [
 
 [[package]]
 name = "subsecond"
-version = "0.7.0-alpha.1"
+version = "0.7.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c5b40acd555d02d9a0b5bf4080dbf2cd085d5e2eb2ae7851cb14b9bf5af15c"
+checksum = "0e9884adf2ac9e1f7ee7924be9130e000619fb10ecaa108ba39f20ba773e9ab4"
 dependencies = [
  "js-sys",
  "libc",
@@ -5468,9 +5471,9 @@ dependencies = [
 
 [[package]]
 name = "subsecond-types"
-version = "0.7.0-alpha.1"
+version = "0.7.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bedadae58a56e137ac970c38c44bff38cee24400fef64c37d5a188a065b1ec1f"
+checksum = "7cacd233c591f4f27a52b436d38156ce13e666d3da74cf26bf44777a330475f4"
 dependencies = [
  "serde",
 ]
@@ -5500,7 +5503,7 @@ version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
 dependencies = [
- "kurbo 0.11.2",
+ "kurbo 0.11.3",
  "siphasher",
 ]
 
@@ -5517,9 +5520,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.101"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5655,7 +5658,7 @@ dependencies = [
  "fastrand",
  "getrandom 0.3.3",
  "once_cell",
- "rustix 1.0.7",
+ "rustix 1.0.8",
  "windows-sys 0.59.0",
 ]
 
@@ -5719,12 +5722,11 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
@@ -5868,16 +5870,18 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
 dependencies = [
  "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
  "pin-project-lite",
  "signal-hook-registry",
+ "slab",
  "socket2",
  "tokio-macros",
  "windows-sys 0.52.0",
@@ -5921,7 +5925,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.27",
+ "rustls 0.23.29",
  "tokio",
 ]
 
@@ -5952,9 +5956,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.22"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -5964,18 +5968,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.9"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.26"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap",
  "serde",
@@ -6019,9 +6023,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.4"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
 dependencies = [
  "bitflags 2.9.1",
  "bytes",
@@ -6061,9 +6065,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6072,9 +6076,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
@@ -6229,15 +6233,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
 
 [[package]]
 name = "untrusted"
@@ -6281,7 +6279,7 @@ dependencies = [
  "flate2",
  "fontdb 0.18.0",
  "imagesize",
- "kurbo 0.11.2",
+ "kurbo 0.11.3",
  "log",
  "pico-args",
  "roxmltree",
@@ -6317,16 +6315,16 @@ checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
  "getrandom 0.3.3",
  "js-sys",
- "rand 0.9.1",
+ "rand 0.9.2",
  "serde",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "v_frame"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b"
+checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2"
 dependencies = [
  "aligned-vec",
  "num-traits",
@@ -6442,9 +6440,9 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
@@ -6541,9 +6539,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtimer"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0048ad49a55b9deb3953841fa1fc5858f0efbcb7a18868c899a360269fac1b23"
+checksum = "d8d49b5d6c64e8558d9b1b065014426f35c18de636895d24893dbbd329743446"
 dependencies = [
  "futures",
  "js-sys",
@@ -6684,12 +6682,11 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5df295f8451142f1856b1bd86a606dfe9587d439bc036e319c827700dbd555e"
+checksum = "aaf4f3c0ba838e82b4e5ccc4157003fb8c324ee24c058470ffb82820becbde98"
 dependencies = [
  "core-foundation 0.10.1",
- "home",
  "jni",
  "log",
  "ndk-context",
@@ -6705,14 +6702,14 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "webpki-roots 1.0.0",
+ "webpki-roots 1.0.2",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
+checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -6735,18 +6732,21 @@ checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
 
 [[package]]
 name = "wgpu"
-version = "24.0.5"
+version = "26.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0b3436f0729f6cdf2e6e9201f3d39dc95813fad61d826c1ed07918b4539353"
+checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798"
 dependencies = [
  "arrayvec",
  "bitflags 2.9.1",
+ "cfg-if",
  "cfg_aliases",
  "document-features",
+ "hashbrown",
  "js-sys",
  "log",
  "naga",
  "parking_lot",
+ "portable-atomic",
  "profiling",
  "raw-window-handle 0.6.2",
  "smallvec",
@@ -6761,34 +6761,77 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "24.0.5"
+version = "26.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f0aa306497a238d169b9dc70659105b4a096859a34894544ca81719242e1499"
+checksum = "d5f62f1053bd28c2268f42916f31588f81f64796e2ff91b81293515017ca8bd9"
 dependencies = [
  "arrayvec",
+ "bit-set",
  "bit-vec",
  "bitflags 2.9.1",
  "cfg_aliases",
  "document-features",
+ "hashbrown",
  "indexmap",
  "log",
  "naga",
  "once_cell",
  "parking_lot",
+ "portable-atomic",
  "profiling",
  "raw-window-handle 0.6.2",
  "rustc-hash 1.1.0",
  "smallvec",
  "thiserror 2.0.12",
+ "wgpu-core-deps-apple",
+ "wgpu-core-deps-emscripten",
+ "wgpu-core-deps-wasm",
+ "wgpu-core-deps-windows-linux-android",
  "wgpu-hal",
  "wgpu-types",
 ]
 
 [[package]]
-name = "wgpu-hal"
-version = "24.0.4"
+name = "wgpu-core-deps-apple"
+version = "26.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f112f464674ca69f3533248508ee30cb84c67cf06c25ff6800685f5e0294e259"
+checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-core-deps-emscripten"
+version = "26.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7670e390f416006f746b4600fdd9136455e3627f5bd763abf9a65daa216dd2d"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-core-deps-wasm"
+version = "26.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03b9f9e1a50686d315fc6debe4980cc45cd37b0e919351917df494e8fdc8885"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-core-deps-windows-linux-android"
+version = "26.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-hal"
+version = "26.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2971a6c8b903aa9951cf3f3e4d8060904f8c8e905c11f7f5b228edf7faddb719"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -6797,13 +6840,15 @@ dependencies = [
  "bitflags 2.9.1",
  "block",
  "bytemuck",
+ "cfg-if",
  "cfg_aliases",
- "core-graphics-types 0.1.3",
+ "core-graphics-types 0.2.0",
  "glow",
  "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
+ "hashbrown",
  "js-sys",
  "khronos-egl",
  "libc",
@@ -6811,16 +6856,16 @@ dependencies = [
  "log",
  "metal",
  "naga",
- "ndk-sys 0.5.0+25.2.9519653",
+ "ndk-sys",
  "objc",
- "once_cell",
  "ordered-float",
  "parking_lot",
+ "portable-atomic",
+ "portable-atomic-util",
  "profiling",
  "range-alloc",
  "raw-window-handle 0.6.2",
  "renderdoc-sys",
- "rustc-hash 1.1.0",
  "smallvec",
  "thiserror 2.0.12",
  "wasm-bindgen",
@@ -6832,13 +6877,15 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "24.0.0"
+version = "26.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c"
+checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2"
 dependencies = [
  "bitflags 2.9.1",
+ "bytemuck",
  "js-sys",
  "log",
+ "thiserror 2.0.12",
  "web-sys",
 ]
 
@@ -7013,19 +7060,19 @@ dependencies = [
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
 name = "windows-registry"
-version = "0.4.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
 dependencies = [
+ "windows-link",
  "windows-result 0.3.4",
- "windows-strings 0.3.1",
- "windows-targets 0.53.0",
+ "windows-strings 0.4.2",
 ]
 
 [[package]]
@@ -7065,15 +7112,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-strings"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.4.2"
@@ -7119,6 +7157,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -7167,9 +7214,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.0"
+version = "0.53.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
 dependencies = [
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
@@ -7414,9 +7461,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec"
+checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
 dependencies = [
  "memchr",
 ]
@@ -7480,9 +7527,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
 
 [[package]]
 name = "xcursor"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
+checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b"
 
 [[package]]
 name = "xkbcommon-dl"
@@ -7505,9 +7552,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
 
 [[package]]
 name = "xml-rs"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
+checksum = "6fd8403733700263c6eb89f192880191f1b83e332f7a20371ddcf421c4a337c7"
 
 [[package]]
 name = "xmlwriter"
@@ -7562,9 +7609,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.7.1"
+version = "5.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a7c7cee313d044fca3f48fa782cb750c79e4ca76ba7bc7718cd4024cdf6f68"
+checksum = "4bb4f9a464286d42851d18a605f7193b8febaf5b0919d71c6399b7b26e5b0aad"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -7595,9 +7642,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.7.1"
+version = "5.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17e7e5eec1550f747e71a058df81a9a83813ba0f6a95f39c4e218bdc7ba366a"
+checksum = "ef9859f68ee0c4ee2e8cde84737c78e3f4c54f946f2a38645d0d4c7a95327659"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7628,18 +7675,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.25"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.25"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7723,18 +7770,18 @@ dependencies = [
 
 [[package]]
 name = "zune-jpeg"
-version = "0.4.14"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99a5bab8d7dedf81405c4bb1f2b83ea057643d9cb28778cea9eecddeedd2e028"
+checksum = "2c9e525af0a6a658e031e95f14b7f889976b74a11ba0eca5a5fc9ac8a1c43a6a"
 dependencies = [
  "zune-core",
 ]
 
 [[package]]
 name = "zvariant"
-version = "5.5.3"
+version = "5.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d30786f75e393ee63a21de4f9074d4c038d52c5b1bb4471f955db249f9dffb1"
+checksum = "d91b3680bb339216abd84714172b5138a4edac677e641ef17e1d8cb1b3ca6e6f"
 dependencies = [
  "endi",
  "enumflags2",
@@ -7747,9 +7794,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.5.3"
+version = "5.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75fda702cd42d735ccd48117b1630432219c0e9616bf6cb0f8350844ee4d9580"
+checksum = "3a8c68501be459a8dbfffbe5d792acdd23b4959940fc87785fb013b32edbc208"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index c9a3eea0..e1f0c671 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -174,7 +174,7 @@ cosmic-text = "0.14"
 dark-light = "2.0"
 futures = { version = "0.3", default-features = false }
 glam = "0.25"
-cryoglyph = { git = "https://github.com/iced-rs/cryoglyph.git", rev = "a456d1c17bbcf33afcca41d9e5e299f9f1193819" }
+cryoglyph = { git = "https://github.com/iced-rs/cryoglyph.git", rev = "453cedec0d2ec563bd7fa87e84a2319bcebb1ba3" }
 guillotiere = "0.6"
 half = "2.2"
 image = { version = "0.25", default-features = false }
@@ -211,7 +211,7 @@ wasm-bindgen-futures = "0.4"
 wasmtimer = "0.4.1"
 web-sys = "0.3.69"
 web-time = "1.1"
-wgpu = "24.0"
+wgpu = "26.0"
 window_clipboard = "0.4.1"
 winit = { git = "https://github.com/iced-rs/winit.git", rev = "11414b6aa45699f038114e61b4ddf5102b2d3b4b" }
 
diff --git a/benches/wgpu.rs b/benches/wgpu.rs
index c8792b7a..35696abc 100644
--- a/benches/wgpu.rs
+++ b/benches/wgpu.rs
@@ -32,16 +32,15 @@ pub fn wgpu_benchmark(c: &mut Criterion) {
     ))
     .expect("request adapter");
 
-    let (device, queue) = executor::block_on(adapter.request_device(
-        &wgpu::DeviceDescriptor {
+    let (device, queue) =
+        executor::block_on(adapter.request_device(&wgpu::DeviceDescriptor {
             label: None,
             required_features: wgpu::Features::empty(),
             required_limits: wgpu::Limits::default(),
             memory_hints: wgpu::MemoryHints::MemoryUsage,
-        },
-        None,
-    ))
-    .expect("request device");
+            trace: wgpu::Trace::Off,
+        }))
+        .expect("request device");
 
     c.bench_function("wgpu — canvas (light)", |b| {
         benchmark(b, &adapter, &device, &queue, |_| scene(10));
@@ -140,7 +139,7 @@ fn benchmark<'a>(
             &viewport,
         );
 
-        let _ = device.poll(wgpu::Maintain::WaitForSubmissionIndex(submission));
+        let _ = device.poll(wgpu::PollType::WaitForSubmissionIndex(submission));
 
         i += 1;
     });
diff --git a/examples/custom_shader/src/scene/pipeline.rs b/examples/custom_shader/src/scene/pipeline.rs
index 567ab00b..7140bcaa 100644
--- a/examples/custom_shader/src/scene/pipeline.rs
+++ b/examples/custom_shader/src/scene/pipeline.rs
@@ -369,6 +369,7 @@ impl Pipeline {
                     color_attachments: &[Some(
                         wgpu::RenderPassColorAttachment {
                             view: target,
+                            depth_slice: None,
                             resolve_target: None,
                             ops: wgpu::Operations {
                                 load: wgpu::LoadOp::Load,
@@ -568,6 +569,7 @@ impl DepthPipeline {
             label: Some("cubes.pipeline.depth_pass"),
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view: target,
+                depth_slice: None,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Load,
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 16794662..b3c08879 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -96,17 +96,14 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
                         let capabilities = surface.get_capabilities(&adapter);
 
                         let (device, queue) = adapter
-                            .request_device(
-                                &wgpu::DeviceDescriptor {
-                                    label: None,
-                                    required_features: adapter_features
-                                        & wgpu::Features::default(),
-                                    required_limits: wgpu::Limits::default(),
-                                    memory_hints:
-                                        wgpu::MemoryHints::MemoryUsage,
-                                },
-                                None,
-                            )
+                            .request_device(&wgpu::DeviceDescriptor {
+                                label: None,
+                                required_features: adapter_features
+                                    & wgpu::Features::default(),
+                                required_limits: wgpu::Limits::default(),
+                                memory_hints: wgpu::MemoryHints::MemoryUsage,
+                                trace: wgpu::Trace::Off,
+                            })
                             .await
                             .expect("Request device");
 
diff --git a/examples/integration/src/scene.rs b/examples/integration/src/scene.rs
index 7ba551aa..4e4757fa 100644
--- a/examples/integration/src/scene.rs
+++ b/examples/integration/src/scene.rs
@@ -24,6 +24,7 @@ impl Scene {
             label: None,
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view: target,
+                depth_slice: None,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear({
diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs
index 74a452f9..52fe8463 100644
--- a/wgpu/src/color.rs
+++ b/wgpu/src/color.rs
@@ -184,6 +184,7 @@ pub fn convert(
         label: Some("iced_wgpu.offscreen.blit.render_pass"),
         color_attachments: &[Some(wgpu::RenderPassColorAttachment {
             view,
+            depth_slice: None,
             resolve_target: None,
             ops: wgpu::Operations {
                 load: wgpu::LoadOp::Load,
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 7f74905b..b5af87b7 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -284,7 +284,7 @@ impl Renderer {
         let _ = self
             .engine
             .device
-            .poll(wgpu::Maintain::WaitForSubmissionIndex(index));
+            .poll(wgpu::PollType::WaitForSubmissionIndex(index));
 
         let mapped_buffer = slice.get_mapped_range();
 
@@ -426,6 +426,7 @@ impl Renderer {
                 label: Some("iced_wgpu render pass"),
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: frame,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: match clear_color {
@@ -514,6 +515,7 @@ impl Renderer {
                         color_attachments: &[Some(
                             wgpu::RenderPassColorAttachment {
                                 view: frame,
+                                depth_slice: None,
                                 resolve_target: None,
                                 ops: wgpu::Operations {
                                     load: wgpu::LoadOp::Load,
@@ -560,6 +562,7 @@ impl Renderer {
                         color_attachments: &[Some(
                             wgpu::RenderPassColorAttachment {
                                 view: frame,
+                                depth_slice: None,
                                 resolve_target: None,
                                 ops: wgpu::Operations {
                                     load: wgpu::LoadOp::Load,
@@ -831,21 +834,20 @@ impl renderer::Headless for Renderer {
                 force_fallback_adapter: false,
                 compatible_surface: None,
             })
-            .await?;
+            .await
+            .ok()?;
 
         let (device, queue) = adapter
-            .request_device(
-                &wgpu::DeviceDescriptor {
-                    label: Some("iced_wgpu [headless]"),
-                    required_features: wgpu::Features::empty(),
-                    required_limits: wgpu::Limits {
-                        max_bind_groups: 2,
-                        ..wgpu::Limits::default()
-                    },
-                    memory_hints: wgpu::MemoryHints::MemoryUsage,
+            .request_device(&wgpu::DeviceDescriptor {
+                label: Some("iced_wgpu [headless]"),
+                required_features: wgpu::Features::empty(),
+                required_limits: wgpu::Limits {
+                    max_bind_groups: 2,
+                    ..wgpu::Limits::default()
                 },
-                None,
-            )
+                memory_hints: wgpu::MemoryHints::MemoryUsage,
+                trace: wgpu::Trace::Off,
+            })
             .await
             .ok()?;
 
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 78d16e5a..2c900f54 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -335,6 +335,7 @@ fn render<'a>(
                 label: Some("iced_wgpu.triangle.render_pass"),
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: target,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Load,
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index d0449489..8ca49461 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -167,6 +167,7 @@ impl Pipeline {
             label: Some("iced_wgpu.triangle.render_pass"),
             color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view: &targets.attachment,
+                depth_slice: None,
                 resolve_target: Some(&targets.resolve),
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT),
@@ -340,6 +341,7 @@ impl State {
                 label: Some("iced_wgpu::triangle::msaa render pass"),
                 color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: target,
+                    depth_slice: None,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Load,
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index c729ddd0..a8b161a8 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -93,10 +93,10 @@ impl Compositor {
             force_fallback_adapter: false,
         };
 
-        let adapter = instance
-            .request_adapter(&adapter_options)
-            .await
-            .ok_or(Error::NoAdapterFound(format!("{adapter_options:?}")))?;
+        let adapter =
+            instance.request_adapter(&adapter_options).await.map_err(
+                |_error| Error::NoAdapterFound(format!("{adapter_options:?}")),
+            )?;
 
         log::info!("Selected: {:#?}", adapter.get_info());
 
@@ -162,17 +162,15 @@ impl Compositor {
 
         for required_limits in limits {
             let result = adapter
-                .request_device(
-                    &wgpu::DeviceDescriptor {
-                        label: Some(
-                            "iced_wgpu::window::compositor device descriptor",
-                        ),
-                        required_features: wgpu::Features::empty(),
-                        required_limits: required_limits.clone(),
-                        memory_hints: wgpu::MemoryHints::MemoryUsage,
-                    },
-                    None,
-                )
+                .request_device(&wgpu::DeviceDescriptor {
+                    label: Some(
+                        "iced_wgpu::window::compositor device descriptor",
+                    ),
+                    required_features: wgpu::Features::empty(),
+                    required_limits: required_limits.clone(),
+                    memory_hints: wgpu::MemoryHints::MemoryUsage,
+                    trace: wgpu::Trace::Off,
+                })
                 .await;
 
             match result {

From c710591cc88022586ffb8770e8b138ce9acde04c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Thu, 24 Jul 2025 20:53:57 +0200
Subject: [PATCH 13/43] Fix alignment of number in `markdown` ordered lists

---
 widget/src/markdown.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index fe456360..0e7bbc77 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -1321,9 +1321,14 @@ where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
+    let digits = ((start + items.len() as u64).max(1) as f32).log10().ceil();
+
     column(items.iter().enumerate().map(|(i, items)| {
         row![
-            text!("{}.", i as u64 + start).size(settings.text_size),
+            text!("{}.", i as u64 + start)
+                .size(settings.text_size)
+                .align_x(alignment::Horizontal::Right)
+                .width(settings.text_size * ((digits / 2.0).ceil() + 1.0)),
             view_with(
                 items,
                 Settings {
@@ -1337,7 +1342,6 @@ where
         .into()
     }))
     .spacing(settings.spacing * 0.75)
-    .padding([0.0, settings.spacing.0])
     .into()
 }
 

From ff27f2478135c85cd8df2789259abe354ede25d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Mon, 28 Jul 2025 21:28:25 +0200
Subject: [PATCH 14/43] Implement missing `Widget` methods for `table`

---
 widget/src/table.rs | 81 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/widget/src/table.rs b/widget/src/table.rs
index 373f93cc..8fd41306 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -3,6 +3,7 @@ use crate::core;
 use crate::core::alignment;
 use crate::core::layout;
 use crate::core::mouse;
+use crate::core::overlay;
 use crate::core::renderer;
 use crate::core::widget;
 use crate::core::{
@@ -461,6 +462,30 @@ where
         layout::Node::with_children(intrinsic, cells)
     }
 
+    fn update(
+        &mut self,
+        tree: &mut widget::Tree,
+        event: &core::Event,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+        renderer: &Renderer,
+        clipboard: &mut dyn core::Clipboard,
+        shell: &mut core::Shell<'_, Message>,
+        viewport: &Rectangle,
+    ) {
+        for ((cell, state), layout) in self
+            .cells
+            .iter_mut()
+            .zip(&mut tree.children)
+            .zip(layout.children())
+        {
+            cell.as_widget_mut().update(
+                state, event, layout, cursor, renderer, clipboard, shell,
+                viewport,
+            );
+        }
+    }
+
     fn draw(
         &self,
         tree: &widget::Tree,
@@ -533,6 +558,62 @@ where
             }
         }
     }
+
+    fn mouse_interaction(
+        &self,
+        tree: &widget::Tree,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+        viewport: &Rectangle,
+        renderer: &Renderer,
+    ) -> mouse::Interaction {
+        self.cells
+            .iter()
+            .zip(&tree.children)
+            .zip(layout.children())
+            .map(|((cell, state), layout)| {
+                cell.as_widget().mouse_interaction(
+                    state, layout, cursor, viewport, renderer,
+                )
+            })
+            .max()
+            .unwrap_or_default()
+    }
+
+    fn operate(
+        &self,
+        tree: &mut widget::Tree,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+        operation: &mut dyn widget::Operation,
+    ) {
+        for ((cell, state), layout) in self
+            .cells
+            .iter()
+            .zip(&mut tree.children)
+            .zip(layout.children())
+        {
+            cell.as_widget().operate(state, layout, renderer, operation);
+        }
+    }
+
+    fn overlay<'b>(
+        &'b mut self,
+        state: &'b mut widget::Tree,
+        layout: Layout<'b>,
+        renderer: &Renderer,
+        viewport: &Rectangle,
+        translation: core::Vector,
+    ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
+        overlay::from_children(
+            &mut self.cells,
+            state,
+            layout,
+            renderer,
+            viewport,
+            translation,
+        )
+    }
 }
 
 impl<'a, Message, Theme, Renderer> From<Table<'a, Message, Theme, Renderer>>

From d897ccd49e08f7873880009688dd135fb80ae3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 29 Jul 2025 22:24:12 +0200
Subject: [PATCH 15/43] Fix inconsistent styling for `toggler` and `checkbox`

---
 widget/src/checkbox.rs | 33 +++++++++------------------------
 widget/src/toggler.rs  |  8 ++++----
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index a38f5945..8fce8b1d 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -556,21 +556,18 @@ pub fn primary(theme: &Theme, status: Status) -> Style {
 
     match status {
         Status::Active { is_checked } => styled(
-            palette.primary.strong.text,
             palette.background.strongest.color,
             palette.background.base,
             palette.primary.base,
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            palette.primary.strong.text,
             palette.background.strongest.color,
             palette.background.weak,
             palette.primary.strong,
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
-            palette.primary.strong.text,
             palette.background.weak.color,
             palette.background.weak,
             palette.background.strong,
@@ -585,21 +582,18 @@ pub fn secondary(theme: &Theme, status: Status) -> Style {
 
     match status {
         Status::Active { is_checked } => styled(
-            palette.background.base.text,
             palette.background.strongest.color,
             palette.background.base,
             palette.background.strong,
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            palette.background.base.text,
             palette.background.strongest.color,
             palette.background.weak,
             palette.background.strong,
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
-            palette.background.strong.color,
             palette.background.weak.color,
             palette.background.weak,
             palette.background.weak,
@@ -614,21 +608,18 @@ pub fn success(theme: &Theme, status: Status) -> Style {
 
     match status {
         Status::Active { is_checked } => styled(
-            palette.success.base.text,
             palette.background.weak.color,
             palette.background.base,
             palette.success.base,
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            palette.success.base.text,
             palette.background.strongest.color,
             palette.background.weak,
             palette.success.strong,
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
-            palette.success.base.text,
             palette.background.weak.color,
             palette.background.weak,
             palette.success.weak,
@@ -643,21 +634,18 @@ pub fn danger(theme: &Theme, status: Status) -> Style {
 
     match status {
         Status::Active { is_checked } => styled(
-            palette.danger.base.text,
             palette.background.strongest.color,
             palette.background.base,
             palette.danger.base,
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            palette.danger.base.text,
             palette.background.strongest.color,
             palette.background.weak,
             palette.danger.strong,
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
-            palette.danger.base.text,
             palette.background.weak.color,
             palette.background.weak,
             palette.danger.weak,
@@ -667,27 +655,24 @@ pub fn danger(theme: &Theme, status: Status) -> Style {
 }
 
 fn styled(
-    icon_color: Color,
     border_color: Color,
     base: palette::Pair,
     accent: palette::Pair,
     is_checked: bool,
 ) -> Style {
+    let (background, border) = if is_checked {
+        (accent, accent.color)
+    } else {
+        (base, border_color)
+    };
+
     Style {
-        background: Background::Color(if is_checked {
-            accent.color
-        } else {
-            base.color
-        }),
-        icon_color,
+        background: Background::Color(background.color),
+        icon_color: background.text,
         border: Border {
             radius: 2.0.into(),
             width: 1.0,
-            color: if is_checked {
-                accent.color
-            } else {
-                border_color
-            },
+            color: border,
         },
         text_color: None,
     }
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index 786844b2..02c53671 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -557,9 +557,9 @@ pub fn default(theme: &Theme, status: Status) -> Style {
     let background = match status {
         Status::Active { is_toggled } | Status::Hovered { is_toggled } => {
             if is_toggled {
-                palette.primary.strong.color
+                palette.primary.base.color
             } else {
-                palette.background.strong.color
+                palette.background.strongest.color
             }
         }
         Status::Disabled => palette.background.weak.color,
@@ -568,7 +568,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
     let foreground = match status {
         Status::Active { is_toggled } => {
             if is_toggled {
-                palette.primary.strong.text
+                palette.primary.base.text
             } else {
                 palette.background.base.color
             }
@@ -577,7 +577,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
             if is_toggled {
                 Color {
                     a: 0.5,
-                    ..palette.primary.strong.text
+                    ..palette.primary.base.text
                 }
             } else {
                 palette.background.weak.color

From b2aa8794b8c89d583db9bdbd55df81edf62c1c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 29 Jul 2025 22:25:23 +0200
Subject: [PATCH 16/43] Regenerate snapshots for `styling` example

---
 examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256    | 2 +-
 .../styling/snapshots/catppuccin_macchiato-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256    | 2 +-
 examples/styling/snapshots/dark-tiny-skia.sha256                | 2 +-
 examples/styling/snapshots/dracula-tiny-skia.sha256             | 2 +-
 examples/styling/snapshots/ferra-tiny-skia.sha256               | 2 +-
 examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256        | 2 +-
 examples/styling/snapshots/gruvbox_light-tiny-skia.sha256       | 2 +-
 examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256      | 2 +-
 examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256       | 2 +-
 examples/styling/snapshots/light-tiny-skia.sha256               | 2 +-
 examples/styling/snapshots/moonfly-tiny-skia.sha256             | 2 +-
 examples/styling/snapshots/nightfly-tiny-skia.sha256            | 2 +-
 examples/styling/snapshots/nord-tiny-skia.sha256                | 2 +-
 examples/styling/snapshots/oxocarbon-tiny-skia.sha256           | 2 +-
 examples/styling/snapshots/solarized_dark-tiny-skia.sha256      | 2 +-
 examples/styling/snapshots/solarized_light-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/tokyo_night-tiny-skia.sha256         | 2 +-
 examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256   | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
index 3309ffc7..9f3c38f9 100644
--- a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
@@ -1 +1 @@
-30570747bb062e9f7730cdd58be961c84bcf4711a6983185bff6d903e8d29e9c
\ No newline at end of file
+9997d6c670b61d64ed4ba03f68ed429aed61b48c37d0911eba2412ae108eeceb
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index 8c303beb..27278e0e 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-039a950d09d34df222606eaf2166e65f86d5536f8abfaff0e295219c974d54c0
\ No newline at end of file
+273e7d93a8c974ee6cb72ee3a0ef8af535de4725240d3b2b766e2e9cf82058c5
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
index ec379562..f953b780 100644
--- a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
@@ -1 +1 @@
-30e523961db89a3ee97ad1eac09e727ecb3dec485faa362534a9f5ad083b32dd
\ No newline at end of file
+e812294b7190bd90648f1b1f49b0f6c7a928a7d82a661ca2e08c9c077d78f2b6
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
index 86583521..3a46518c 100644
--- a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
@@ -1 +1 @@
-bce5427d5105f68e1d7fa18a34fcc551cb78c2fefd9a583ba44686331133436d
\ No newline at end of file
+cafdd968afa1822a11999230efd68dc49e6862b623002577100d20ac1f3ba091
\ No newline at end of file
diff --git a/examples/styling/snapshots/dark-tiny-skia.sha256 b/examples/styling/snapshots/dark-tiny-skia.sha256
index 5453059b..daf28ea6 100644
--- a/examples/styling/snapshots/dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/dark-tiny-skia.sha256
@@ -1 +1 @@
-c8a7edbd5a8bbf559134b84253e14e65340f4ffe3e22c272b21c8438e47ffaf7
\ No newline at end of file
+87e36407028f617cc1ea7f1cfa916c7b2700648f5529d60d10823235e4f2b6f5
\ No newline at end of file
diff --git a/examples/styling/snapshots/dracula-tiny-skia.sha256 b/examples/styling/snapshots/dracula-tiny-skia.sha256
index d4b41911..9f86c76a 100644
--- a/examples/styling/snapshots/dracula-tiny-skia.sha256
+++ b/examples/styling/snapshots/dracula-tiny-skia.sha256
@@ -1 +1 @@
-63d646b22d3dffbb56dac2e3f345090bd26625a388dd6cc142359f2a7ac9c8df
\ No newline at end of file
+340844c15f99eb15834e5c668797a264b3ec75e1cb625e8f646c75c910df7a54
\ No newline at end of file
diff --git a/examples/styling/snapshots/ferra-tiny-skia.sha256 b/examples/styling/snapshots/ferra-tiny-skia.sha256
index 2e2c2eab..d9be73c3 100644
--- a/examples/styling/snapshots/ferra-tiny-skia.sha256
+++ b/examples/styling/snapshots/ferra-tiny-skia.sha256
@@ -1 +1 @@
-d26f55674cbd96bc3b534ffdd098a13199718ef9c5ffe8ece0882ddab714b776
\ No newline at end of file
+ca136af173608230dcfbe220651f9a0e78784df49beb46c004d172dce9104152
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
index 8249f9c3..e1eeebb3 100644
--- a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
@@ -1 +1 @@
-482c44c13d4ff3de19e71f3dddf93bbee170e54e2d353e818811069de28e18ed
\ No newline at end of file
+d4fdd94393ede2986305f9b1490df814e07872ebf6777870071e2380f5714594
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index 0277b685..88568622 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-6738cc4fc6eb8a5d406c613a4b0f08c0e8dcd2c1a5444445eebd3888f9303841
\ No newline at end of file
+ea5e46792eb115a37f79bc71093b23b7b4747a800386803acc9deb72f4440cb4
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
index 7995a848..435409c1 100644
--- a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
@@ -1 +1 @@
-0a918c52538fc4848aa0c68d8f2d6f4c981ed68971dd9c725f0093a39ef7f353
\ No newline at end of file
+fcaea6df790076770cc9418a3fdc1d833f20862b30b37199ad1d560f79ef798c
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index b68211a1..40a97574 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-de3e1a2c21e1a86d76ca99989c73e8a2596ef627bba95d246fab8f02d56bd0af
\ No newline at end of file
+8ae1713aba0f6e44b3e8fd6dfc9a273dc96473d9d7271708d1dee9bc65edc64d
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
index d9848230..54db5b64 100644
--- a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
@@ -1 +1 @@
-3418ea4eb0f7786607ef02e7db4bc97309530f2f7c08f8aea15c768a13a09ca4
\ No newline at end of file
+0d85722fdef1ee6e3fd81a854541fc9957ab5ba68c3dd28f20f5e29e75a1e520
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index e9864b81..f787fb11 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-c8474e02a9df23f123816a489c1ea7ae6cb994a0eca429592dfe6d933de1beee
\ No newline at end of file
+e948afe18753aee9eaf08fa6eff6882310d6387b9c7e4c76804971f113d22f8d
\ No newline at end of file
diff --git a/examples/styling/snapshots/moonfly-tiny-skia.sha256 b/examples/styling/snapshots/moonfly-tiny-skia.sha256
index 6456da10..b7162df4 100644
--- a/examples/styling/snapshots/moonfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/moonfly-tiny-skia.sha256
@@ -1 +1 @@
-02095fd09c078be02dc41e29e55de25e8a79e6ad4293aa7e430257a9016dfb3d
\ No newline at end of file
+362c4ff052c95dd333208e10a91b6c18e190d6135c106031910960b495268c18
\ No newline at end of file
diff --git a/examples/styling/snapshots/nightfly-tiny-skia.sha256 b/examples/styling/snapshots/nightfly-tiny-skia.sha256
index f2ef8296..b17998dd 100644
--- a/examples/styling/snapshots/nightfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/nightfly-tiny-skia.sha256
@@ -1 +1 @@
-d82588a2aba3e7211f25b85ebb812a42dfa59137dd4b59d26f5f60d5b28e537f
\ No newline at end of file
+dbd590536a61ed576bebf3ce6bb3f7a58f9d18af7926192e6ab041bc52161c1e
\ No newline at end of file
diff --git a/examples/styling/snapshots/nord-tiny-skia.sha256 b/examples/styling/snapshots/nord-tiny-skia.sha256
index 3905db54..19d0b183 100644
--- a/examples/styling/snapshots/nord-tiny-skia.sha256
+++ b/examples/styling/snapshots/nord-tiny-skia.sha256
@@ -1 +1 @@
-d6b73545929cc7794c1a918f069b5326ef129bed8f9ad2cd001be7d078a2b6a0
\ No newline at end of file
+4d7415f0929f2085e6ce7f84eeb4154a9d50ec8444b77b21430c14c983ef7fad
\ No newline at end of file
diff --git a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
index 363fcf31..d496286b 100644
--- a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
+++ b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
@@ -1 +1 @@
-0ec7251c69755becd678b7aec398a275edf31cc077960723cd6b9364e8678548
\ No newline at end of file
+66159b13e4299e07478225ee228f2a52ef54811b30c99c17862392961ba2bde5
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
index 6de6c786..cf4cb77a 100644
--- a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
@@ -1 +1 @@
-d87f3a00de5ee52db12a21c09e8689d8d489cce6eb8c8ce1b89192b85587e9a0
\ No newline at end of file
+9cb50a451c4754a68a2d2928de62009690de25ba3e984316be3b262b5f36d6ff
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index 163561bc..40832314 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-7be707e7b8fb91e82c3cc33bf6c12e5c1a37db65616a35f5999351c26bbd0e50
\ No newline at end of file
+00247dc93a3367acb0e718aa6054454f2c8bbd455c0be4d85cf0a37381dc342e
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
index 2607513b..056fb753 100644
--- a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
@@ -1 +1 @@
-3c0b41e13decdc826ddf05e3805c33f624bccc1f1fbe39b2fb8e6880ad18e472
\ No newline at end of file
+4cdd5894bf5290923051a3718afac6b671a2f91313590a9639b89cd4dd165724
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index 77b3136d..bd8af0a9 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-1bb6f75eb390cae16dab87947623e15f0e7dafdb79e89f700d0fbf16129ffd1b
\ No newline at end of file
+50421b07e0ce866eb2a2fd673e7db04b103ea686d0c7bb2b15b28bb1828605cb
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
index ac5f0ad2..4fabb54d 100644
--- a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
@@ -1 +1 @@
-533d25575e8bf1111036fb082b424d0d0e60947a7da8428ab8c71e0bda01469e
\ No newline at end of file
+2abc833759be56e25ed4129eba3acd55e89ef9442c8700313b97624777eabaf4
\ No newline at end of file

From 686c008dc853a5a591d765380236be09d16bb991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 29 Jul 2025 22:42:20 +0200
Subject: [PATCH 17/43] Make `toggler` always perfectly round

---
 widget/src/toggler.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index 02c53671..7f6e6795 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -394,9 +394,6 @@ where
         _cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
-        /// Makes sure that the border radius of the toggler looks good at every size.
-        const BORDER_RADIUS_RATIO: f32 = 32.0 / 13.0;
-
         /// The space ratio between the background Quad and the Toggler bounds, and
         /// between the background Quad and foreground Quad.
         const SPACE_RATIO: f32 = 0.05;
@@ -423,7 +420,7 @@ where
         let style = theme
             .style(&self.class, self.last_status.unwrap_or(Status::Disabled));
 
-        let border_radius = bounds.height / BORDER_RADIUS_RATIO;
+        let border_radius = bounds.height / 2.0;
         let space = (SPACE_RATIO * bounds.height).round();
 
         let toggler_background_bounds = Rectangle {

From d475ae5b454b82cb549d6dd961ae158eb5ac7f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 29 Jul 2025 22:43:09 +0200
Subject: [PATCH 18/43] Regenerate `styling` snapshots (again!)

---
 examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256    | 2 +-
 .../styling/snapshots/catppuccin_macchiato-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256    | 2 +-
 examples/styling/snapshots/dark-tiny-skia.sha256                | 2 +-
 examples/styling/snapshots/dracula-tiny-skia.sha256             | 2 +-
 examples/styling/snapshots/ferra-tiny-skia.sha256               | 2 +-
 examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256        | 2 +-
 examples/styling/snapshots/gruvbox_light-tiny-skia.sha256       | 2 +-
 examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256      | 2 +-
 examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256       | 2 +-
 examples/styling/snapshots/light-tiny-skia.sha256               | 2 +-
 examples/styling/snapshots/moonfly-tiny-skia.sha256             | 2 +-
 examples/styling/snapshots/nightfly-tiny-skia.sha256            | 2 +-
 examples/styling/snapshots/nord-tiny-skia.sha256                | 2 +-
 examples/styling/snapshots/oxocarbon-tiny-skia.sha256           | 2 +-
 examples/styling/snapshots/solarized_dark-tiny-skia.sha256      | 2 +-
 examples/styling/snapshots/solarized_light-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/tokyo_night-tiny-skia.sha256         | 2 +-
 examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256   | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
index 9f3c38f9..2bd284d9 100644
--- a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
@@ -1 +1 @@
-9997d6c670b61d64ed4ba03f68ed429aed61b48c37d0911eba2412ae108eeceb
\ No newline at end of file
+ef4ec93b2a945544b4fa4c95a591f68f55f094dbf471a729feff47c5aee701d0
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index 27278e0e..c5221c62 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-273e7d93a8c974ee6cb72ee3a0ef8af535de4725240d3b2b766e2e9cf82058c5
\ No newline at end of file
+843545b1bccc675a70a85444aa308195228af07b83f3f15fc6f33cd792fd154b
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
index f953b780..fce64f4b 100644
--- a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
@@ -1 +1 @@
-e812294b7190bd90648f1b1f49b0f6c7a928a7d82a661ca2e08c9c077d78f2b6
\ No newline at end of file
+0be82e937336e017e46cb7fee4fb91de0991cee0e188d47edecb469f26e59456
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
index 3a46518c..bb8a0bf3 100644
--- a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
@@ -1 +1 @@
-cafdd968afa1822a11999230efd68dc49e6862b623002577100d20ac1f3ba091
\ No newline at end of file
+0a959b6b4b2f5e563770cb6a8830bec45175fef40f6bb5f2f3547a975e482e52
\ No newline at end of file
diff --git a/examples/styling/snapshots/dark-tiny-skia.sha256 b/examples/styling/snapshots/dark-tiny-skia.sha256
index daf28ea6..d2a5c1b7 100644
--- a/examples/styling/snapshots/dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/dark-tiny-skia.sha256
@@ -1 +1 @@
-87e36407028f617cc1ea7f1cfa916c7b2700648f5529d60d10823235e4f2b6f5
\ No newline at end of file
+aa31f838c99a68c5b5657ccd6d097a5d80c683f276801ba856e592af69347b5b
\ No newline at end of file
diff --git a/examples/styling/snapshots/dracula-tiny-skia.sha256 b/examples/styling/snapshots/dracula-tiny-skia.sha256
index 9f86c76a..55ea1194 100644
--- a/examples/styling/snapshots/dracula-tiny-skia.sha256
+++ b/examples/styling/snapshots/dracula-tiny-skia.sha256
@@ -1 +1 @@
-340844c15f99eb15834e5c668797a264b3ec75e1cb625e8f646c75c910df7a54
\ No newline at end of file
+e98671222f80fbc6d9e46769cf0b404e05805dd13b7224f4ace1d5e531bc5432
\ No newline at end of file
diff --git a/examples/styling/snapshots/ferra-tiny-skia.sha256 b/examples/styling/snapshots/ferra-tiny-skia.sha256
index d9be73c3..03ba46bc 100644
--- a/examples/styling/snapshots/ferra-tiny-skia.sha256
+++ b/examples/styling/snapshots/ferra-tiny-skia.sha256
@@ -1 +1 @@
-ca136af173608230dcfbe220651f9a0e78784df49beb46c004d172dce9104152
\ No newline at end of file
+52b44eec4351df9ea9456f2ddc639bf7a2d40b4ee1601f8fb9bddc02114481ab
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
index e1eeebb3..4147f8b0 100644
--- a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
@@ -1 +1 @@
-d4fdd94393ede2986305f9b1490df814e07872ebf6777870071e2380f5714594
\ No newline at end of file
+061c1484344847c074c8c227cb34f992f5bce214b15afa5b53f12b9fa9408958
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index 88568622..8cdc5a26 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-ea5e46792eb115a37f79bc71093b23b7b4747a800386803acc9deb72f4440cb4
\ No newline at end of file
+97847ca503b2d512063afb602d8a0812851ff4cd2239d686d6ae2b65c2fbace3
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
index 435409c1..e07db4dd 100644
--- a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
@@ -1 +1 @@
-fcaea6df790076770cc9418a3fdc1d833f20862b30b37199ad1d560f79ef798c
\ No newline at end of file
+b14c4b9ae3f3f4431f5b38d5858463e5f26e250abbe18310de2a87ec0e8d8934
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index 40a97574..e196a048 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-8ae1713aba0f6e44b3e8fd6dfc9a273dc96473d9d7271708d1dee9bc65edc64d
\ No newline at end of file
+64477871a7f50eaee22da7f894d1e9a1f4bbe0a09480c9b72be3d5cb86b29508
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
index 54db5b64..2c5e6f53 100644
--- a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
@@ -1 +1 @@
-0d85722fdef1ee6e3fd81a854541fc9957ab5ba68c3dd28f20f5e29e75a1e520
\ No newline at end of file
+f427f7364bf812627d0e02b28e8308f77e5cf50f14e582486fa8c6124dfcce48
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index f787fb11..c4ee6414 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-e948afe18753aee9eaf08fa6eff6882310d6387b9c7e4c76804971f113d22f8d
\ No newline at end of file
+b75046299cdfe00df8cb4d54811ffbfb26adc1efda6222469a85725d96002f09
\ No newline at end of file
diff --git a/examples/styling/snapshots/moonfly-tiny-skia.sha256 b/examples/styling/snapshots/moonfly-tiny-skia.sha256
index b7162df4..afb7f8d3 100644
--- a/examples/styling/snapshots/moonfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/moonfly-tiny-skia.sha256
@@ -1 +1 @@
-362c4ff052c95dd333208e10a91b6c18e190d6135c106031910960b495268c18
\ No newline at end of file
+5bde8b05efc65444506e39f56a7c41382492393c02ba78bbab5310a0e7fdd5c4
\ No newline at end of file
diff --git a/examples/styling/snapshots/nightfly-tiny-skia.sha256 b/examples/styling/snapshots/nightfly-tiny-skia.sha256
index b17998dd..8036f382 100644
--- a/examples/styling/snapshots/nightfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/nightfly-tiny-skia.sha256
@@ -1 +1 @@
-dbd590536a61ed576bebf3ce6bb3f7a58f9d18af7926192e6ab041bc52161c1e
\ No newline at end of file
+3fb3b060d1aae24ca2207ccc9c35b99b0683a59b5bd90323f4c47ad39ff907ff
\ No newline at end of file
diff --git a/examples/styling/snapshots/nord-tiny-skia.sha256 b/examples/styling/snapshots/nord-tiny-skia.sha256
index 19d0b183..c0aecba3 100644
--- a/examples/styling/snapshots/nord-tiny-skia.sha256
+++ b/examples/styling/snapshots/nord-tiny-skia.sha256
@@ -1 +1 @@
-4d7415f0929f2085e6ce7f84eeb4154a9d50ec8444b77b21430c14c983ef7fad
\ No newline at end of file
+e31139a7f3a33f3fd1e541bd8533887e8122e395cb6ff866fc0d8efcc5f1718d
\ No newline at end of file
diff --git a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
index d496286b..89159b54 100644
--- a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
+++ b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
@@ -1 +1 @@
-66159b13e4299e07478225ee228f2a52ef54811b30c99c17862392961ba2bde5
\ No newline at end of file
+7246ccdeb5b490e1aa89a93e84af7b8451157d984051b748cea230b073ecf800
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
index cf4cb77a..2c40ccca 100644
--- a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
@@ -1 +1 @@
-9cb50a451c4754a68a2d2928de62009690de25ba3e984316be3b262b5f36d6ff
\ No newline at end of file
+85c904fecfbac2118ecf92a3fd30d59246f2bb4e8a9e04d30b2d94e1d8380d9e
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index 40832314..defff0fb 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-00247dc93a3367acb0e718aa6054454f2c8bbd455c0be4d85cf0a37381dc342e
\ No newline at end of file
+d031ed95c689025e3fabad1eb67f80482f3f985fd651614f2fdc68a9a9351714
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
index 056fb753..54b04fc5 100644
--- a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
@@ -1 +1 @@
-4cdd5894bf5290923051a3718afac6b671a2f91313590a9639b89cd4dd165724
\ No newline at end of file
+86eac86f1e49096ea97f20a64fefbfacdfdf215fae91b135e638e1e931b24ce8
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index bd8af0a9..5a72174d 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-50421b07e0ce866eb2a2fd673e7db04b103ea686d0c7bb2b15b28bb1828605cb
\ No newline at end of file
+23eb825aad0f7cff9a3798fbe61742a9cb89195d88a0ca11ea2b2e08a38b89d0
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
index 4fabb54d..7c3f2238 100644
--- a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
@@ -1 +1 @@
-2abc833759be56e25ed4129eba3acd55e89ef9442c8700313b97624777eabaf4
\ No newline at end of file
+373f9fb949137ff28977a60ea3e793ac98a8a065ed4a90fdc450e2cf09678faf
\ No newline at end of file

From 0e46b3cbc8ec8bd708eb1ff346736bf7d3b98a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Sat, 2 Aug 2025 20:28:12 +0200
Subject: [PATCH 19/43] Fix `rule` widget drawing outside of layout bounds

---
 widget/src/rule.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/src/rule.rs b/widget/src/rule.rs
index 2bb893b2..d847577e 100644
--- a/widget/src/rule.rs
+++ b/widget/src/rule.rs
@@ -134,7 +134,7 @@ where
         let style = theme.style(&self.class);
 
         let bounds = if self.is_horizontal {
-            let line_y = (bounds.y + (bounds.height / 2.0)).round();
+            let line_y = bounds.y.round();
 
             let (offset, line_width) = style.fill_mode.fill(bounds.width);
             let line_x = bounds.x + offset;
@@ -146,7 +146,7 @@ where
                 height: bounds.height,
             }
         } else {
-            let line_x = (bounds.x + (bounds.width / 2.0)).round();
+            let line_x = bounds.x.round();
 
             let (offset, line_height) = style.fill_mode.fill(bounds.height);
             let line_y = bounds.y + offset;

From 3d7306844bca8eb51b94cb69a79d2beb87d8c7e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Sat, 2 Aug 2025 20:29:11 +0200
Subject: [PATCH 20/43] Regenerate `styling` snaphots (x3!)

---
 examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256    | 2 +-
 .../styling/snapshots/catppuccin_macchiato-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256    | 2 +-
 examples/styling/snapshots/dark-tiny-skia.sha256                | 2 +-
 examples/styling/snapshots/dracula-tiny-skia.sha256             | 2 +-
 examples/styling/snapshots/ferra-tiny-skia.sha256               | 2 +-
 examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256        | 2 +-
 examples/styling/snapshots/gruvbox_light-tiny-skia.sha256       | 2 +-
 examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256      | 2 +-
 examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256       | 2 +-
 examples/styling/snapshots/light-tiny-skia.sha256               | 2 +-
 examples/styling/snapshots/moonfly-tiny-skia.sha256             | 2 +-
 examples/styling/snapshots/nightfly-tiny-skia.sha256            | 2 +-
 examples/styling/snapshots/nord-tiny-skia.sha256                | 2 +-
 examples/styling/snapshots/oxocarbon-tiny-skia.sha256           | 2 +-
 examples/styling/snapshots/solarized_dark-tiny-skia.sha256      | 2 +-
 examples/styling/snapshots/solarized_light-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/tokyo_night-tiny-skia.sha256         | 2 +-
 examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256   | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
index 2bd284d9..3447c62c 100644
--- a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
@@ -1 +1 @@
-ef4ec93b2a945544b4fa4c95a591f68f55f094dbf471a729feff47c5aee701d0
\ No newline at end of file
+3b1021606c376c7464e5a08c7837a70e78dd3f34cf406ef59fa32c19c9d078db
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index c5221c62..f90fcc63 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-843545b1bccc675a70a85444aa308195228af07b83f3f15fc6f33cd792fd154b
\ No newline at end of file
+243eebb06988f950845f0ecf1f633b072adb98a572f649d7414fdbcc9710a36c
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
index fce64f4b..9dc26c58 100644
--- a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
@@ -1 +1 @@
-0be82e937336e017e46cb7fee4fb91de0991cee0e188d47edecb469f26e59456
\ No newline at end of file
+ef5e170eb0131dec2325e381f8597148f2158e132a652da9e77cd398b3582dc8
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
index bb8a0bf3..813010ec 100644
--- a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
@@ -1 +1 @@
-0a959b6b4b2f5e563770cb6a8830bec45175fef40f6bb5f2f3547a975e482e52
\ No newline at end of file
+c595ecad47757b13052f1947400ead4cb2ede5c60966cfb45504409600d39a7d
\ No newline at end of file
diff --git a/examples/styling/snapshots/dark-tiny-skia.sha256 b/examples/styling/snapshots/dark-tiny-skia.sha256
index d2a5c1b7..0cfa406e 100644
--- a/examples/styling/snapshots/dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/dark-tiny-skia.sha256
@@ -1 +1 @@
-aa31f838c99a68c5b5657ccd6d097a5d80c683f276801ba856e592af69347b5b
\ No newline at end of file
+ac739a8276d62d868e963e9bd9022556ec45756b4f84dc5faf389cfc632b22ca
\ No newline at end of file
diff --git a/examples/styling/snapshots/dracula-tiny-skia.sha256 b/examples/styling/snapshots/dracula-tiny-skia.sha256
index 55ea1194..2fa0c45e 100644
--- a/examples/styling/snapshots/dracula-tiny-skia.sha256
+++ b/examples/styling/snapshots/dracula-tiny-skia.sha256
@@ -1 +1 @@
-e98671222f80fbc6d9e46769cf0b404e05805dd13b7224f4ace1d5e531bc5432
\ No newline at end of file
+52665bd69812c2e5cd5ec6e03985c66446fdfc0d65647a2dec41e3f86e91484f
\ No newline at end of file
diff --git a/examples/styling/snapshots/ferra-tiny-skia.sha256 b/examples/styling/snapshots/ferra-tiny-skia.sha256
index 03ba46bc..14c66d25 100644
--- a/examples/styling/snapshots/ferra-tiny-skia.sha256
+++ b/examples/styling/snapshots/ferra-tiny-skia.sha256
@@ -1 +1 @@
-52b44eec4351df9ea9456f2ddc639bf7a2d40b4ee1601f8fb9bddc02114481ab
\ No newline at end of file
+6a7b0a66f0fcfea0f9e8d2480830badb7d0b9682205608c66fc6f7e736367edf
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
index 4147f8b0..997af2ae 100644
--- a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
@@ -1 +1 @@
-061c1484344847c074c8c227cb34f992f5bce214b15afa5b53f12b9fa9408958
\ No newline at end of file
+aa69552446a454b82c230cea86255be1d0a62c44dd30e2501aa4f73962384a12
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index 8cdc5a26..14b9e90a 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-97847ca503b2d512063afb602d8a0812851ff4cd2239d686d6ae2b65c2fbace3
\ No newline at end of file
+08df5615aefb4ed54f4586ff3bc17b02d2e7e5262a08b37b9c528962274d67f8
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
index e07db4dd..0829e12f 100644
--- a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
@@ -1 +1 @@
-b14c4b9ae3f3f4431f5b38d5858463e5f26e250abbe18310de2a87ec0e8d8934
\ No newline at end of file
+dafe2b3b254b6bae8456fe25f2c6596ed935b0c7fbee8928041e88d0ff6ea66f
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index e196a048..e5b854ae 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-64477871a7f50eaee22da7f894d1e9a1f4bbe0a09480c9b72be3d5cb86b29508
\ No newline at end of file
+8fd6da3baf1e58fa8621b036d01a207c5b7c050b691107e62112ed2b6dc28cde
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
index 2c5e6f53..7b7247c6 100644
--- a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
@@ -1 +1 @@
-f427f7364bf812627d0e02b28e8308f77e5cf50f14e582486fa8c6124dfcce48
\ No newline at end of file
+52b37f151e27b79b6d797cc33c35ce60503d0d04fd9cb14e5879911850fe6f08
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index c4ee6414..4e03f63c 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-b75046299cdfe00df8cb4d54811ffbfb26adc1efda6222469a85725d96002f09
\ No newline at end of file
+9b151f4545cc6ce9c565072f4bed055d9dacb777eeda42adee22e7a8e5e21abb
\ No newline at end of file
diff --git a/examples/styling/snapshots/moonfly-tiny-skia.sha256 b/examples/styling/snapshots/moonfly-tiny-skia.sha256
index afb7f8d3..f0da5364 100644
--- a/examples/styling/snapshots/moonfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/moonfly-tiny-skia.sha256
@@ -1 +1 @@
-5bde8b05efc65444506e39f56a7c41382492393c02ba78bbab5310a0e7fdd5c4
\ No newline at end of file
+233e1df72111c1b8688350699eefb86df8a1b20775bc7b1f6a7809987378b232
\ No newline at end of file
diff --git a/examples/styling/snapshots/nightfly-tiny-skia.sha256 b/examples/styling/snapshots/nightfly-tiny-skia.sha256
index 8036f382..4b8a8691 100644
--- a/examples/styling/snapshots/nightfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/nightfly-tiny-skia.sha256
@@ -1 +1 @@
-3fb3b060d1aae24ca2207ccc9c35b99b0683a59b5bd90323f4c47ad39ff907ff
\ No newline at end of file
+ec57eae43df3015ad94e55f5c6a43ae9aabdfda795d786fef01ba4ae8a3c3211
\ No newline at end of file
diff --git a/examples/styling/snapshots/nord-tiny-skia.sha256 b/examples/styling/snapshots/nord-tiny-skia.sha256
index c0aecba3..55faebe8 100644
--- a/examples/styling/snapshots/nord-tiny-skia.sha256
+++ b/examples/styling/snapshots/nord-tiny-skia.sha256
@@ -1 +1 @@
-e31139a7f3a33f3fd1e541bd8533887e8122e395cb6ff866fc0d8efcc5f1718d
\ No newline at end of file
+b3aff5e06612b117b3e7d4041b052e615f46198529a18466c0edf203b465bf8a
\ No newline at end of file
diff --git a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
index 89159b54..d84bfe47 100644
--- a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
+++ b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
@@ -1 +1 @@
-7246ccdeb5b490e1aa89a93e84af7b8451157d984051b748cea230b073ecf800
\ No newline at end of file
+96629b00a5f840b3c9d62ab02cdc6cb7c93024362ec45246040da6a0fd90b073
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
index 2c40ccca..c1acfed6 100644
--- a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
@@ -1 +1 @@
-85c904fecfbac2118ecf92a3fd30d59246f2bb4e8a9e04d30b2d94e1d8380d9e
\ No newline at end of file
+bdd7394c25ede2c213305466c355c5898a3ad4623c1c9c04048e02fbef7d5ba0
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index defff0fb..565292b8 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-d031ed95c689025e3fabad1eb67f80482f3f985fd651614f2fdc68a9a9351714
\ No newline at end of file
+49aa531f84f4423b84a122c54faab5f92aba65659f3639cb77a7bc7772b2e666
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
index 54b04fc5..b6a6a4a6 100644
--- a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
@@ -1 +1 @@
-86eac86f1e49096ea97f20a64fefbfacdfdf215fae91b135e638e1e931b24ce8
\ No newline at end of file
+5d58a7acbbb0f3c73a2a8dec64f6ec0b9752be093b4e3d332b4f6241665ed642
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index 5a72174d..6aa9cbeb 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-23eb825aad0f7cff9a3798fbe61742a9cb89195d88a0ca11ea2b2e08a38b89d0
\ No newline at end of file
+bf99f421d038972dee3081e162637601764e857399f00697da5d8fc77f324d74
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
index 7c3f2238..bb61f035 100644
--- a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
@@ -1 +1 @@
-373f9fb949137ff28977a60ea3e793ac98a8a065ed4a90fdc450e2cf09678faf
\ No newline at end of file
+c75ce7c48720a210b9ad805396867ff153c5590c0e112953566a069e34ba2672
\ No newline at end of file

From 83a7a50d8b85ecac2e77bca43fc3a08d486d7e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Sat, 2 Aug 2025 20:52:17 +0200
Subject: [PATCH 21/43] Add `weak` styling for `rule`

---
 widget/src/rule.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/widget/src/rule.rs b/widget/src/rule.rs
index d847577e..d70109bc 100644
--- a/widget/src/rule.rs
+++ b/widget/src/rule.rs
@@ -300,3 +300,15 @@ pub fn default(theme: &Theme) -> Style {
         snap: true,
     }
 }
+
+/// A [`Rule`] styling using the weak background color.
+pub fn weak(theme: &Theme) -> Style {
+    let palette = theme.extended_palette();
+
+    Style {
+        color: palette.background.weak.color,
+        radius: 0.0.into(),
+        fill_mode: FillMode::Full,
+        snap: true,
+    }
+}

From a39e76acbada8ad8227f55db6e5fdf55e365f27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Sat, 2 Aug 2025 20:52:31 +0200
Subject: [PATCH 22/43] Add `subtle` styling for `button`

---
 widget/src/button.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/widget/src/button.rs b/widget/src/button.rs
index 85f16f59..6227f499 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -688,6 +688,29 @@ pub fn text(theme: &Theme, status: Status) -> Style {
     }
 }
 
+/// A subtle button using background shades.
+pub fn subtle(theme: &Theme, status: Status) -> Style {
+    let palette = theme.extended_palette();
+    let base = styled(palette.background.weakest);
+
+    match status {
+        Status::Active => base,
+        Status::Pressed => Style {
+            background: Some(Background::Color(
+                palette.background.strongest.color,
+            )),
+            ..base
+        },
+        Status::Hovered => Style {
+            background: Some(Background::Color(
+                palette.background.strong.color,
+            )),
+            ..base
+        },
+        Status::Disabled => disabled(base),
+    }
+}
+
 fn styled(pair: palette::Pair) -> Style {
     Style {
         background: Some(Background::Color(pair.color)),

From c46600a69a11197f88b33f49bd076dd422d0575c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Sat, 2 Aug 2025 22:27:19 +0200
Subject: [PATCH 23/43] Make `Pop::on_resize` trigger when no `on_show` set

---
 widget/src/pop.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/widget/src/pop.rs b/widget/src/pop.rs
index 44da6a4e..b580950c 100644
--- a/widget/src/pop.rs
+++ b/widget/src/pop.rs
@@ -215,7 +215,16 @@ where
 
             let distance = top_left_distance.min(bottom_right_distance);
 
-            if state.has_popped_in {
+            if self.on_show.is_none() {
+                if let Some(on_resize) = &self.on_resize {
+                    let size = bounds.size();
+
+                    if Some(size) != state.last_size {
+                        state.last_size = Some(size);
+                        shell.publish(on_resize(size));
+                    }
+                }
+            } else if state.has_popped_in {
                 if distance <= self.anticipate.0 {
                     if let Some(on_resize) = &self.on_resize {
                         let size = bounds.size();
@@ -229,7 +238,7 @@ where
                     state.has_popped_in = false;
                     state.should_notify_at = Some((false, *now + self.delay));
                 }
-            } else if self.on_show.is_some() && distance <= self.anticipate.0 {
+            } else if distance <= self.anticipate.0 {
                 let size = bounds.size();
 
                 state.has_popped_in = true;

From 57c628839a654100eb10ac29364236f6c19d75d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Sat, 2 Aug 2025 22:57:09 +0200
Subject: [PATCH 24/43] Rename `pop` widget to `sensor` :satellite:

---
 examples/gallery/src/main.rs     |  4 ++--
 examples/markdown/src/main.rs    |  4 ++--
 widget/src/helpers.rs            | 14 ++++++++------
 widget/src/lib.rs                |  6 +++---
 widget/src/{pop.rs => sensor.rs} | 31 ++++++++++++++++---------------
 5 files changed, 31 insertions(+), 28 deletions(-)
 rename widget/src/{pop.rs => sensor.rs} (93%)

diff --git a/examples/gallery/src/main.rs b/examples/gallery/src/main.rs
index a40df370..14d20103 100644
--- a/examples/gallery/src/main.rs
+++ b/examples/gallery/src/main.rs
@@ -10,7 +10,7 @@ use iced::animation;
 use iced::time::{Instant, milliseconds};
 use iced::widget::{
     button, container, float, grid, horizontal_space, image, mouse_area,
-    opaque, pop, scrollable, stack,
+    opaque, scrollable, sensor, stack,
 };
 use iced::window;
 use iced::{
@@ -257,7 +257,7 @@ fn card<'a>(
             .style(button::text)
             .into()
     } else {
-        pop(card)
+        sensor(card)
             .on_show(|_| Message::ImagePoppedIn(metadata.id))
             .into()
     }
diff --git a/examples/markdown/src/main.rs b/examples/markdown/src/main.rs
index 98d19595..b7195055 100644
--- a/examples/markdown/src/main.rs
+++ b/examples/markdown/src/main.rs
@@ -6,7 +6,7 @@ use iced::highlighter;
 use iced::time::{self, Instant, milliseconds};
 use iced::widget::{
     self, button, center_x, container, horizontal_space, hover, image,
-    markdown, pop, right, row, scrollable, text_editor, toggler,
+    markdown, right, row, scrollable, sensor, text_editor, toggler,
 };
 use iced::window;
 use iced::{
@@ -267,7 +267,7 @@ impl<'a> markdown::Viewer<'a, Message> for CustomViewer<'a> {
             )
             .into()
         } else {
-            pop(horizontal_space())
+            sensor(horizontal_space())
                 .key_ref(url.as_str())
                 .delay(milliseconds(500))
                 .on_show(|_size| Message::ImageShown(url.clone()))
diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 232cecd8..6815c3fc 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -25,7 +25,7 @@ use crate::text_input::{self, TextInput};
 use crate::toggler::{self, Toggler};
 use crate::tooltip::{self, Tooltip};
 use crate::vertical_slider::{self, VerticalSlider};
-use crate::{Column, Grid, MouseArea, Pin, Pop, Row, Space, Stack, Themer};
+use crate::{Column, Grid, MouseArea, Pin, Row, Sensor, Space, Stack, Themer};
 
 use std::borrow::Borrow;
 use std::ops::RangeInclusive;
@@ -990,18 +990,20 @@ where
     })
 }
 
-/// Creates a new [`Pop`] widget.
+/// Creates a new [`Sensor`] widget.
+///
+/// A [`Sensor`] widget can generate messages when its contents are shown,
+/// hidden, or resized.
 ///
-/// A [`Pop`] widget can generate messages when it pops in and out of view.
 /// It can even notify you with anticipation at a given distance!
-pub fn pop<'a, Message, Theme, Renderer>(
+pub fn sensor<'a, Message, Theme, Renderer>(
     content: impl Into<Element<'a, Message, Theme, Renderer>>,
-) -> Pop<'a, (), Message, Theme, Renderer>
+) -> Sensor<'a, (), Message, Theme, Renderer>
 where
     Renderer: core::Renderer,
     Message: Clone,
 {
-    Pop::new(content)
+    Sensor::new(content)
 }
 
 /// Creates a new [`Scrollable`] with the provided content.
diff --git a/widget/src/lib.rs b/widget/src/lib.rs
index 7c144ce2..d08a92f9 100644
--- a/widget/src/lib.rs
+++ b/widget/src/lib.rs
@@ -26,12 +26,12 @@ pub mod keyed;
 pub mod overlay;
 pub mod pane_grid;
 pub mod pick_list;
-pub mod pop;
 pub mod progress_bar;
 pub mod radio;
 pub mod row;
 pub mod rule;
 pub mod scrollable;
+pub mod sensor;
 pub mod slider;
 pub mod table;
 pub mod text;
@@ -74,8 +74,6 @@ pub use pick_list::PickList;
 #[doc(no_inline)]
 pub use pin::Pin;
 #[doc(no_inline)]
-pub use pop::Pop;
-#[doc(no_inline)]
 pub use progress_bar::ProgressBar;
 #[doc(no_inline)]
 pub use radio::Radio;
@@ -86,6 +84,8 @@ pub use rule::Rule;
 #[doc(no_inline)]
 pub use scrollable::Scrollable;
 #[doc(no_inline)]
+pub use sensor::Sensor;
+#[doc(no_inline)]
 pub use slider::Slider;
 #[doc(no_inline)]
 pub use space::Space;
diff --git a/widget/src/pop.rs b/widget/src/sensor.rs
similarity index 93%
rename from widget/src/pop.rs
rename to widget/src/sensor.rs
index b580950c..ff5e6fd6 100644
--- a/widget/src/pop.rs
+++ b/widget/src/sensor.rs
@@ -16,7 +16,7 @@ use crate::core::{
 ///
 /// It can even notify you with anticipation at a given distance!
 #[allow(missing_debug_implementations)]
-pub struct Pop<
+pub struct Sensor<
     'a,
     Key,
     Message,
@@ -32,12 +32,12 @@ pub struct Pop<
     delay: Duration,
 }
 
-impl<'a, Message, Theme, Renderer> Pop<'a, (), Message, Theme, Renderer>
+impl<'a, Message, Theme, Renderer> Sensor<'a, (), Message, Theme, Renderer>
 where
     Message: Clone,
     Renderer: core::Renderer,
 {
-    /// Creates a new [`Pop`] widget with the given content.
+    /// Creates a new [`Sensor`] widget with the given content.
     pub fn new(
         content: impl Into<Element<'a, Message, Theme, Renderer>>,
     ) -> Self {
@@ -53,7 +53,8 @@ where
     }
 }
 
-impl<'a, Key, Message, Theme, Renderer> Pop<'a, Key, Message, Theme, Renderer>
+impl<'a, Key, Message, Theme, Renderer>
+    Sensor<'a, Key, Message, Theme, Renderer>
 where
     Message: Clone,
     Key: self::Key,
@@ -84,17 +85,17 @@ where
         self
     }
 
-    /// Sets the key of the [`Pop`] widget, for continuity.
+    /// Sets the key of the [`Sensor`] widget, for continuity.
     ///
-    /// If the key changes, the [`Pop`] widget will trigger again.
+    /// If the key changes, the [`Sensor`] widget will trigger again.
     pub fn key<K>(
         self,
         key: K,
-    ) -> Pop<'a, impl self::Key, Message, Theme, Renderer>
+    ) -> Sensor<'a, impl self::Key, Message, Theme, Renderer>
     where
         K: Clone + PartialEq + 'static,
     {
-        Pop {
+        Sensor {
             content: self.content,
             key: OwnedKey(key),
             on_show: self.on_show,
@@ -105,18 +106,18 @@ where
         }
     }
 
-    /// Sets the key of the [`Pop`] widget, for continuity; using a reference.
+    /// Sets the key of the [`Sensor`], for continuity; using a reference.
     ///
-    /// If the key changes, the [`Pop`] widget will trigger again.
+    /// If the key changes, the [`Sensor`] will trigger again.
     pub fn key_ref<K>(
         self,
         key: &'a K,
-    ) -> Pop<'a, &'a K, Message, Theme, Renderer>
+    ) -> Sensor<'a, &'a K, Message, Theme, Renderer>
     where
         K: ToOwned + PartialEq<K::Owned> + ?Sized,
         K::Owned: 'static,
     {
-        Pop {
+        Sensor {
             content: self.content,
             key,
             on_show: self.on_show,
@@ -160,7 +161,7 @@ struct State<Key> {
 }
 
 impl<Key, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
-    for Pop<'_, Key, Message, Theme, Renderer>
+    for Sensor<'_, Key, Message, Theme, Renderer>
 where
     Key: self::Key,
     Message: Clone,
@@ -368,7 +369,7 @@ where
 }
 
 impl<'a, Key, Message, Theme, Renderer>
-    From<Pop<'a, Key, Message, Theme, Renderer>>
+    From<Sensor<'a, Key, Message, Theme, Renderer>>
     for Element<'a, Message, Theme, Renderer>
 where
     Message: Clone + 'a,
@@ -376,7 +377,7 @@ where
     Renderer: core::Renderer + 'a,
     Theme: 'a,
 {
-    fn from(pop: Pop<'a, Key, Message, Theme, Renderer>) -> Self {
+    fn from(pop: Sensor<'a, Key, Message, Theme, Renderer>) -> Self {
         Element::new(pop)
     }
 }

From 6b937fb6e122dc3b4e1704311a14a58a05ec693a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Sun, 3 Aug 2025 03:02:45 +0200
Subject: [PATCH 25/43] Use smart horizontal `scrollable` in `markdown::table`

---
 widget/src/markdown.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index 0e7bbc77..01ce0ce8 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -1430,7 +1430,7 @@ where
 {
     use crate::table;
 
-    table(
+    let table = table(
         columns.iter().enumerate().map(move |(i, column)| {
             table::column(
                 items(viewer, settings, &column.header),
@@ -1459,8 +1459,14 @@ where
     )
     .padding_x(settings.spacing.0)
     .padding_y(settings.spacing.0 / 2.0)
-    .separator_x(0)
-    .into()
+    .separator_x(0);
+
+    scrollable(table)
+        .direction(scrollable::Direction::Horizontal(
+            scrollable::Scrollbar::default(),
+        ))
+        .spacing(settings.spacing.0 / 2.0)
+        .into()
 }
 
 /// Displays a column of items with the default look.

From c98f3d525a78b45fea6e218c42c92a1002710708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Sun, 3 Aug 2025 21:09:15 +0200
Subject: [PATCH 26/43] Add `background` styling for `button`

---
 .../catppuccin_frappé-tiny-skia.sha256        |  2 +-
 .../catppuccin_latte-tiny-skia.sha256         |  2 +-
 .../catppuccin_macchiato-tiny-skia.sha256     |  2 +-
 .../catppuccin_mocha-tiny-skia.sha256         |  2 +-
 .../styling/snapshots/dark-tiny-skia.sha256   |  2 +-
 .../snapshots/dracula-tiny-skia.sha256        |  2 +-
 .../styling/snapshots/ferra-tiny-skia.sha256  |  2 +-
 .../snapshots/gruvbox_dark-tiny-skia.sha256   |  2 +-
 .../snapshots/gruvbox_light-tiny-skia.sha256  |  2 +-
 .../kanagawa_dragon-tiny-skia.sha256          |  2 +-
 .../snapshots/kanagawa_lotus-tiny-skia.sha256 |  2 +-
 .../snapshots/kanagawa_wave-tiny-skia.sha256  |  2 +-
 .../styling/snapshots/light-tiny-skia.sha256  |  2 +-
 .../snapshots/moonfly-tiny-skia.sha256        |  2 +-
 .../snapshots/nightfly-tiny-skia.sha256       |  2 +-
 .../styling/snapshots/nord-tiny-skia.sha256   |  2 +-
 .../snapshots/oxocarbon-tiny-skia.sha256      |  2 +-
 .../snapshots/solarized_dark-tiny-skia.sha256 |  2 +-
 .../solarized_light-tiny-skia.sha256          |  2 +-
 .../snapshots/tokyo_night-tiny-skia.sha256    |  2 +-
 .../tokyo_night_light-tiny-skia.sha256        |  2 +-
 .../tokyo_night_storm-tiny-skia.sha256        |  2 +-
 widget/src/button.rs                          | 23 ++++++++++++++++++-
 widget/src/container.rs                       |  2 +-
 24 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
index 3447c62c..188d6c67 100644
--- a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
@@ -1 +1 @@
-3b1021606c376c7464e5a08c7837a70e78dd3f34cf406ef59fa32c19c9d078db
\ No newline at end of file
+e440e5e00db4fff0a79251aaf493c4af86241196a746d9147a895d14f01b1283
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index f90fcc63..b72ceb65 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-243eebb06988f950845f0ecf1f633b072adb98a572f649d7414fdbcc9710a36c
\ No newline at end of file
+d81cf7c3974fc5b49251e8287c536fd3477c18e7afd3e9e42619364db7787fcc
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
index 9dc26c58..2cca5768 100644
--- a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
@@ -1 +1 @@
-ef5e170eb0131dec2325e381f8597148f2158e132a652da9e77cd398b3582dc8
\ No newline at end of file
+ad4fbda3cc3d60209320dd713b7be6b0a5e6b55650689d70ac563a0a81f2eefc
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
index 813010ec..4dd06594 100644
--- a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
@@ -1 +1 @@
-c595ecad47757b13052f1947400ead4cb2ede5c60966cfb45504409600d39a7d
\ No newline at end of file
+3863252d1f15750d7f5375bd23e8363c6a70d77ac9aac853e3515f7ff5170bce
\ No newline at end of file
diff --git a/examples/styling/snapshots/dark-tiny-skia.sha256 b/examples/styling/snapshots/dark-tiny-skia.sha256
index 0cfa406e..e8ae6200 100644
--- a/examples/styling/snapshots/dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/dark-tiny-skia.sha256
@@ -1 +1 @@
-ac739a8276d62d868e963e9bd9022556ec45756b4f84dc5faf389cfc632b22ca
\ No newline at end of file
+c0bc58fcbde8e7ac4447ba4a454c5c2cb2c6d570e873897887c626b2dc07329b
\ No newline at end of file
diff --git a/examples/styling/snapshots/dracula-tiny-skia.sha256 b/examples/styling/snapshots/dracula-tiny-skia.sha256
index 2fa0c45e..4b48c1d2 100644
--- a/examples/styling/snapshots/dracula-tiny-skia.sha256
+++ b/examples/styling/snapshots/dracula-tiny-skia.sha256
@@ -1 +1 @@
-52665bd69812c2e5cd5ec6e03985c66446fdfc0d65647a2dec41e3f86e91484f
\ No newline at end of file
+1f17779b3291c133399f1eba9f7e517889108d60dbaa8d5b6cd024ad67ef1c8c
\ No newline at end of file
diff --git a/examples/styling/snapshots/ferra-tiny-skia.sha256 b/examples/styling/snapshots/ferra-tiny-skia.sha256
index 14c66d25..6ea26878 100644
--- a/examples/styling/snapshots/ferra-tiny-skia.sha256
+++ b/examples/styling/snapshots/ferra-tiny-skia.sha256
@@ -1 +1 @@
-6a7b0a66f0fcfea0f9e8d2480830badb7d0b9682205608c66fc6f7e736367edf
\ No newline at end of file
+51d7bfc1af8ba7503b9800ae7eaaa660047d9b16b0bdc1e8a3850df1d9901652
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
index 997af2ae..173efa4e 100644
--- a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
@@ -1 +1 @@
-aa69552446a454b82c230cea86255be1d0a62c44dd30e2501aa4f73962384a12
\ No newline at end of file
+5423fa06a1dc73f9cce42447f3134768114e8321c8f2367da1e04db4d4673f52
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index 14b9e90a..b1b97fa5 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-08df5615aefb4ed54f4586ff3bc17b02d2e7e5262a08b37b9c528962274d67f8
\ No newline at end of file
+b7ea69b9ce1f73694cccb8b0bc9acab35fc4dcedd01795e3897215c416550fc2
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
index 0829e12f..3c6e8060 100644
--- a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
@@ -1 +1 @@
-dafe2b3b254b6bae8456fe25f2c6596ed935b0c7fbee8928041e88d0ff6ea66f
\ No newline at end of file
+fa43206adec5dce05c4181ec5d9c71d15067dd3b1d7f5b3267c452cf1de2ca95
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index e5b854ae..84c64e60 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-8fd6da3baf1e58fa8621b036d01a207c5b7c050b691107e62112ed2b6dc28cde
\ No newline at end of file
+5d7445700ff415428ae43d32ef30b279c38ddc6ffd0e3619ea28044b1d8c709b
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
index 7b7247c6..b27cd469 100644
--- a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
@@ -1 +1 @@
-52b37f151e27b79b6d797cc33c35ce60503d0d04fd9cb14e5879911850fe6f08
\ No newline at end of file
+52d424e4dfa3ae9b1195e95f17eb655675e4507ec8fb4e36372612fd57a5d86d
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index 4e03f63c..2c30b309 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-9b151f4545cc6ce9c565072f4bed055d9dacb777eeda42adee22e7a8e5e21abb
\ No newline at end of file
+a0c84b36979f6a6f780af80689425b92a1b68743c39f8e519efcb11b46b9de42
\ No newline at end of file
diff --git a/examples/styling/snapshots/moonfly-tiny-skia.sha256 b/examples/styling/snapshots/moonfly-tiny-skia.sha256
index f0da5364..377e0509 100644
--- a/examples/styling/snapshots/moonfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/moonfly-tiny-skia.sha256
@@ -1 +1 @@
-233e1df72111c1b8688350699eefb86df8a1b20775bc7b1f6a7809987378b232
\ No newline at end of file
+21820cf793f0a3af6fd339132b32cc77cbca52f1ca32f7ae334f74849a046ba8
\ No newline at end of file
diff --git a/examples/styling/snapshots/nightfly-tiny-skia.sha256 b/examples/styling/snapshots/nightfly-tiny-skia.sha256
index 4b8a8691..a4a22ca2 100644
--- a/examples/styling/snapshots/nightfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/nightfly-tiny-skia.sha256
@@ -1 +1 @@
-ec57eae43df3015ad94e55f5c6a43ae9aabdfda795d786fef01ba4ae8a3c3211
\ No newline at end of file
+1ba92e64ddcc5f5fc6f841d5fde961382099e7698a253ac93670b900287ee55c
\ No newline at end of file
diff --git a/examples/styling/snapshots/nord-tiny-skia.sha256 b/examples/styling/snapshots/nord-tiny-skia.sha256
index 55faebe8..d1f4cf12 100644
--- a/examples/styling/snapshots/nord-tiny-skia.sha256
+++ b/examples/styling/snapshots/nord-tiny-skia.sha256
@@ -1 +1 @@
-b3aff5e06612b117b3e7d4041b052e615f46198529a18466c0edf203b465bf8a
\ No newline at end of file
+f6559f58f9acae81d929ee1aa5f8db33fca9d4ff49d21acf1e627d891ed77565
\ No newline at end of file
diff --git a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
index d84bfe47..5cb7f75e 100644
--- a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
+++ b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
@@ -1 +1 @@
-96629b00a5f840b3c9d62ab02cdc6cb7c93024362ec45246040da6a0fd90b073
\ No newline at end of file
+d3d34b3b02b11156cb9a545d60cba078e78e4124c8f3ae61be66908a42799166
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
index c1acfed6..367d8198 100644
--- a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
@@ -1 +1 @@
-bdd7394c25ede2c213305466c355c5898a3ad4623c1c9c04048e02fbef7d5ba0
\ No newline at end of file
+3c983866c4feaa10ed34206c1a4c98933e87ba6239849bd7e1b7876f6c9596e7
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index 565292b8..bf7fb05b 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-49aa531f84f4423b84a122c54faab5f92aba65659f3639cb77a7bc7772b2e666
\ No newline at end of file
+dc6fc66e651d938a42f0a9c642a99e33865b87aefc3fdeafa1848f6a3fab20c3
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
index b6a6a4a6..5685ce2f 100644
--- a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
@@ -1 +1 @@
-5d58a7acbbb0f3c73a2a8dec64f6ec0b9752be093b4e3d332b4f6241665ed642
\ No newline at end of file
+7104099471f9c712f00cd2ac80e150e10f7d21604d7edc6b13181e74d42eb877
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index 6aa9cbeb..2efd8415 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-bf99f421d038972dee3081e162637601764e857399f00697da5d8fc77f324d74
\ No newline at end of file
+263b5eb190d7db2ab0a67dc8b73778d9130755b07a8295345c758e158fb52881
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
index bb61f035..c8a8d1ed 100644
--- a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
@@ -1 +1 @@
-c75ce7c48720a210b9ad805396867ff153c5590c0e112953566a069e34ba2672
\ No newline at end of file
+6fd5700c7a63ba004957601e0d91b02e8d08b710cff81710d3b8cd1cb668faa6
\ No newline at end of file
diff --git a/widget/src/button.rs b/widget/src/button.rs
index 6227f499..37c07169 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -688,7 +688,28 @@ pub fn text(theme: &Theme, status: Status) -> Style {
     }
 }
 
-/// A subtle button using background shades.
+/// A button using background shades.
+pub fn background(theme: &Theme, status: Status) -> Style {
+    let palette = theme.extended_palette();
+    let base = styled(palette.background.base);
+
+    match status {
+        Status::Active => base,
+        Status::Pressed => Style {
+            background: Some(Background::Color(
+                palette.background.strong.color,
+            )),
+            ..base
+        },
+        Status::Hovered => Style {
+            background: Some(Background::Color(palette.background.weak.color)),
+            ..base
+        },
+        Status::Disabled => disabled(base),
+    }
+}
+
+/// A subtle button using weak background shades.
 pub fn subtle(theme: &Theme, status: Status) -> Style {
     let palette = theme.extended_palette();
     let base = styled(palette.background.weakest);
diff --git a/widget/src/container.rs b/widget/src/container.rs
index 84bb5237..ab332b32 100644
--- a/widget/src/container.rs
+++ b/widget/src/container.rs
@@ -712,7 +712,7 @@ pub fn bordered_box(theme: &Theme) -> Style {
         border: Border {
             width: 1.0,
             radius: 5.0.into(),
-            color: palette.background.strong.color,
+            color: palette.background.weak.color,
         },
         ..Style::default()
     }

From f8a8a8571756a0b8889f806bc3cf994868d9bfda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Sun, 3 Aug 2025 22:16:45 +0200
Subject: [PATCH 27/43] Add `align_x` support for `row::Wrapping`

---
 widget/src/row.rs | 56 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/widget/src/row.rs b/widget/src/row.rs
index 7bd8799f..101e51d8 100644
--- a/widget/src/row.rs
+++ b/widget/src/row.rs
@@ -160,6 +160,7 @@ where
         Wrapping {
             row: self,
             vertical_spacing: None,
+            align_x: alignment::Horizontal::Left,
         }
     }
 }
@@ -368,6 +369,7 @@ pub struct Wrapping<
 > {
     row: Row<'a, Message, Theme, Renderer>,
     vertical_spacing: Option<f32>,
+    align_x: alignment::Horizontal,
 }
 
 impl<Message, Theme, Renderer> Wrapping<'_, Message, Theme, Renderer> {
@@ -376,6 +378,15 @@ impl<Message, Theme, Renderer> Wrapping<'_, Message, Theme, Renderer> {
         self.vertical_spacing = Some(amount.into().0);
         self
     }
+
+    /// Sets the horizontal alignment of the wrapping [`Row`].
+    pub fn align_x(
+        mut self,
+        align_x: impl Into<alignment::Horizontal>,
+    ) -> Self {
+        self.align_x = align_x.into();
+        self
+    }
 }
 
 impl<Message, Theme, Renderer> Widget<Message, Theme, Renderer>
@@ -423,9 +434,9 @@ where
             Alignment::End => 1.0,
         };
 
-        let align = |row_start: std::ops::Range<usize>,
-                     row_height: f32,
-                     children: &mut Vec<layout::Node>| {
+        let align_y = |row_start: std::ops::Range<usize>,
+                       row_height: f32,
+                       children: &mut Vec<layout::Node>| {
             if align_factor != 0.0 {
                 for node in &mut children[row_start] {
                     let height = node.size().height;
@@ -450,7 +461,7 @@ where
             if x != 0.0 && x + child_size.width > max_width {
                 intrinsic_size.width = intrinsic_size.width.max(x - spacing);
 
-                align(row_start..i, row_height, &mut children);
+                align_y(row_start..i, row_height, &mut children);
 
                 y += row_height + vertical_spacing;
                 x = 0.0;
@@ -473,7 +484,42 @@ where
         }
 
         intrinsic_size.height = y + row_height;
-        align(row_start..children.len(), row_height, &mut children);
+        align_y(row_start..children.len(), row_height, &mut children);
+
+        let align_factor = match self.align_x {
+            alignment::Horizontal::Left => 0.0,
+            alignment::Horizontal::Center => 2.0,
+            alignment::Horizontal::Right => 1.0,
+        };
+
+        if align_factor != 0.0 {
+            let total_width = intrinsic_size.width;
+
+            let mut row_start = 0;
+
+            for i in 0..children.len() {
+                let bounds = children[i].bounds();
+                let row_width = bounds.x + bounds.width;
+
+                let next_x = children
+                    .get(i + 1)
+                    .map(|node| node.bounds().x)
+                    .unwrap_or_default();
+
+                if next_x == 0.0 {
+                    let translation = Vector::new(
+                        (total_width - row_width) / align_factor,
+                        0.0,
+                    );
+
+                    for node in &mut children[row_start..=i] {
+                        node.translate_mut(translation);
+                    }
+
+                    row_start = i + 1;
+                }
+            }
+        }
 
         let size =
             limits.resolve(self.row.width, self.row.height, intrinsic_size);

From 148fc77b8fbe0c8ad9b85428aa4c3bdac80c4b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Mon, 4 Aug 2025 00:45:00 +0200
Subject: [PATCH 28/43] Fix `background` of `inline_code_highlight` in
 `markdown`

---
 widget/src/markdown.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs
index 01ce0ce8..35e7549c 100644
--- a/widget/src/markdown.rs
+++ b/widget/src/markdown.rs
@@ -1072,8 +1072,8 @@ impl Style {
         Self {
             inline_code_padding: padding::left(1).right(1),
             inline_code_highlight: Highlight {
-                background: color!(0x111).into(),
-                border: border::rounded(2),
+                background: color!(0x111111).into(),
+                border: border::rounded(4),
             },
             inline_code_color: Color::WHITE,
             link_color: palette.primary,

From 0857eb3bdee96fd8492796fb1f45535336d641b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 5 Aug 2025 09:21:57 +0200
Subject: [PATCH 29/43] Improve contrast of built-in themes by leveraging Oklch

---
 core/src/color.rs                             |  10 +-
 core/src/theme/palette.rs                     | 172 +++++++++---------
 core/src/widget/text.rs                       |   2 +-
 .../catppuccin_frappé-tiny-skia.sha256        |   2 +-
 .../catppuccin_latte-tiny-skia.sha256         |   2 +-
 .../catppuccin_macchiato-tiny-skia.sha256     |   2 +-
 .../catppuccin_mocha-tiny-skia.sha256         |   2 +-
 .../styling/snapshots/dark-tiny-skia.sha256   |   2 +-
 .../snapshots/dracula-tiny-skia.sha256        |   2 +-
 .../styling/snapshots/ferra-tiny-skia.sha256  |   2 +-
 .../snapshots/gruvbox_dark-tiny-skia.sha256   |   2 +-
 .../snapshots/gruvbox_light-tiny-skia.sha256  |   2 +-
 .../kanagawa_dragon-tiny-skia.sha256          |   2 +-
 .../snapshots/kanagawa_lotus-tiny-skia.sha256 |   2 +-
 .../snapshots/kanagawa_wave-tiny-skia.sha256  |   2 +-
 .../styling/snapshots/light-tiny-skia.sha256  |   2 +-
 .../snapshots/moonfly-tiny-skia.sha256        |   2 +-
 .../snapshots/nightfly-tiny-skia.sha256       |   2 +-
 .../styling/snapshots/nord-tiny-skia.sha256   |   2 +-
 .../snapshots/oxocarbon-tiny-skia.sha256      |   2 +-
 .../snapshots/solarized_dark-tiny-skia.sha256 |   2 +-
 .../solarized_light-tiny-skia.sha256          |   2 +-
 .../snapshots/tokyo_night-tiny-skia.sha256    |   2 +-
 .../tokyo_night_light-tiny-skia.sha256        |   2 +-
 .../tokyo_night_storm-tiny-skia.sha256        |   2 +-
 widget/src/button.rs                          |   4 +-
 widget/src/text_editor.rs                     |   3 +-
 widget/src/text_input.rs                      |   5 +-
 28 files changed, 124 insertions(+), 116 deletions(-)

diff --git a/core/src/color.rs b/core/src/color.rs
index a280c795..65a47781 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -90,12 +90,12 @@ impl Color {
             }
         }
 
-        Self {
-            r: gamma_component(r),
-            g: gamma_component(g),
-            b: gamma_component(b),
+        Self::new(
+            gamma_component(r),
+            gamma_component(g),
+            gamma_component(b),
             a,
-        }
+        )
     }
 
     /// Parses a [`Color`] from a hex string.
diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index d9ac6402..96a48695 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -28,7 +28,7 @@ impl Palette {
         text: Color::BLACK,
         primary: color!(0x5865F2),
         success: color!(0x12664f),
-        warning: color!(0xffc14e),
+        warning: color!(0xb77e33),
         danger: color!(0xc3423f),
     };
 
@@ -453,9 +453,13 @@ pub struct Background {
     /// The weakest version of the base background color.
     pub weakest: Pair,
     /// A weaker version of the base background color.
+    pub weaker: Pair,
+    /// A weak version of the base background color.
     pub weak: Pair,
-    /// A stronger version of the base background color.
+    /// A strong version of the base background color.
     pub strong: Pair,
+    /// A stronger version of the base background color.
+    pub stronger: Pair,
     /// The strongest version of the base background color.
     pub strongest: Pair,
 }
@@ -464,15 +468,19 @@ impl Background {
     /// Generates a set of [`Background`] colors from the base and text colors.
     pub fn new(base: Color, text: Color) -> Self {
         let weakest = deviate(base, 0.03);
-        let weak = muted(deviate(base, 0.1));
-        let strong = muted(deviate(base, 0.2));
-        let strongest = muted(deviate(base, 0.3));
+        let weaker = deviate(base, 0.07);
+        let weak = deviate(base, 0.1);
+        let strong = deviate(base, 0.15);
+        let stronger = deviate(base, 0.175);
+        let strongest = deviate(base, 0.20);
 
         Self {
             base: Pair::new(base, text),
             weakest: Pair::new(weakest, text),
+            weaker: Pair::new(weaker, text),
             weak: Pair::new(weak, text),
             strong: Pair::new(strong, text),
+            stronger: Pair::new(stronger, text),
             strongest: Pair::new(strongest, text),
         }
     }
@@ -517,9 +525,11 @@ pub struct Secondary {
 impl Secondary {
     /// Generates a set of [`Secondary`] colors from the base and text colors.
     pub fn generate(base: Color, text: Color) -> Self {
-        let base = mix(base, text, 0.2);
-        let weak = mix(base, text, 0.1);
-        let strong = mix(base, text, 0.3);
+        let bump = if is_dark(base) { 0.0 } else { 0.01 };
+
+        let weak = mix(deviate(base, 0.1 + bump), text, 0.4);
+        let base = mix(deviate(base, 0.3 + bump), text, 0.4);
+        let strong = mix(deviate(base, 0.5 + bump), text, 0.4);
 
         Self {
             base: Pair::new(base, text),
@@ -604,53 +614,51 @@ impl Danger {
     }
 }
 
-struct Hsl {
-    h: f32,
-    s: f32,
+struct Oklch {
     l: f32,
+    c: f32,
+    h: f32,
     a: f32,
 }
 
 fn darken(color: Color, amount: f32) -> Color {
-    let mut hsl = to_hsl(color);
+    let mut oklch = to_oklch(color);
 
-    hsl.l = if hsl.l - amount < 0.0 {
+    // We try to bump the chroma a bit for more colorful palettes
+    oklch.c *= 1.0 + 2.0 * amount / oklch.l.max(0.05);
+
+    oklch.l = if oklch.l - amount < 0.0 {
         0.0
     } else {
-        hsl.l - amount
+        oklch.l - amount
     };
 
-    from_hsl(hsl)
+    from_oklch(oklch)
 }
 
 fn lighten(color: Color, amount: f32) -> Color {
-    let mut hsl = to_hsl(color);
+    let mut oklch = to_oklch(color);
 
-    hsl.l = if hsl.l + amount > 1.0 {
+    // We try to bump the chroma a bit for more colorful palettes
+    oklch.c *= 1.0 + 2.0 * amount / oklch.l.max(0.05);
+
+    oklch.l = if oklch.l + amount > 1.0 {
         1.0
     } else {
-        hsl.l + amount
+        oklch.l + amount
     };
 
-    from_hsl(hsl)
+    from_oklch(oklch)
 }
 
 fn deviate(color: Color, amount: f32) -> Color {
     if is_dark(color) {
         lighten(color, amount)
     } else {
-        darken(color, amount * 0.8)
+        darken(color, amount)
     }
 }
 
-fn muted(color: Color) -> Color {
-    let mut hsl = to_hsl(color);
-
-    hsl.s = hsl.s.min(0.5);
-
-    from_hsl(hsl)
-}
-
 fn mix(a: Color, b: Color, factor: f32) -> Color {
     let b_amount = factor.clamp(0.0, 1.0);
     let a_amount = 1.0 - b_amount;
@@ -680,6 +688,12 @@ fn readable(background: Color, text: Color) -> Color {
         return candidate;
     }
 
+    let candidate = improve(text, 0.2);
+
+    if is_readable(background, candidate) {
+        return candidate;
+    }
+
     let white_contrast = relative_contrast(background, Color::WHITE);
     let black_contrast = relative_contrast(background, Color::BLACK);
 
@@ -691,11 +705,11 @@ fn readable(background: Color, text: Color) -> Color {
 }
 
 fn is_dark(color: Color) -> bool {
-    to_hsl(color).l < 0.6
+    to_oklch(color).l < 0.6
 }
 
 fn is_readable(a: Color, b: Color) -> bool {
-    relative_contrast(a, b) >= 7.0
+    relative_contrast(a, b) >= 6.0
 }
 
 // https://www.w3.org/TR/WCAG21/#dfn-contrast-ratio
@@ -711,65 +725,57 @@ fn relative_luminance(color: Color) -> f32 {
     0.2126 * linear[0] + 0.7152 * linear[1] + 0.0722 * linear[2]
 }
 
-// https://en.wikipedia.org/wiki/HSL_and_HSV#From_RGB
-fn to_hsl(color: Color) -> Hsl {
-    let x_max = color.r.max(color.g).max(color.b);
-    let x_min = color.r.min(color.g).min(color.b);
-    let c = x_max - x_min;
-    let l = x_max.midpoint(x_min);
+// https://en.wikipedia.org/wiki/Oklab_color_space#Conversions_between_color_spaces
+fn to_oklch(color: Color) -> Oklch {
+    let [r, g, b, alpha] = color.into_linear();
 
-    let h = if c == 0.0 {
-        0.0
-    } else if x_max == color.r {
-        60.0 * ((color.g - color.b) / c).rem_euclid(6.0)
-    } else if x_max == color.g {
-        60.0 * (((color.b - color.r) / c) + 2.0)
-    } else {
-        // x_max == color.b
-        60.0 * (((color.r - color.g) / c) + 4.0)
-    };
+    // linear RGB → LMS
+    let l = 0.41222146 * r + 0.53633255 * g + 0.051445995 * b;
+    let m = 0.2119035 * r + 0.6806995 * g + 0.10739696 * b;
+    let s = 0.08830246 * r + 0.28171885 * g + 0.6299787 * b;
 
-    let s = if l == 0.0 || l == 1.0 {
-        0.0
-    } else {
-        (x_max - l) / l.min(1.0 - l)
-    };
+    // Nonlinear transform (cube root)
+    let l_ = l.cbrt();
+    let m_ = m.cbrt();
+    let s_ = s.cbrt();
 
-    Hsl {
-        h,
-        s,
-        l,
-        a: color.a,
-    }
+    // LMS → Oklab
+    let l = 0.21045426 * l_ + 0.7936178 * m_ - 0.004072047 * s_;
+    let a = 1.9779985 * l_ - 2.4285922 * m_ + 0.4505937 * s_;
+    let b = 0.025904037 * l_ + 0.78277177 * m_ - 0.80867577 * s_;
+
+    // Oklab → Oklch
+    let c = (a * a + b * b).sqrt();
+    let h = b.atan2(a); // radians
+
+    Oklch { l, c, h, a: alpha }
 }
 
-// https://en.wikipedia.org/wiki/HSL_and_HSV#HSL_to_RGB
-fn from_hsl(hsl: Hsl) -> Color {
-    let c = (1.0 - (2.0 * hsl.l - 1.0).abs()) * hsl.s;
-    let h = hsl.h / 60.0;
-    let x = c * (1.0 - (h.rem_euclid(2.0) - 1.0).abs());
+// https://en.wikipedia.org/wiki/Oklab_color_space#Conversions_between_color_spaces
+fn from_oklch(oklch: Oklch) -> Color {
+    let Oklch { l, c, h, a: alpha } = oklch;
 
-    let (r1, g1, b1) = if h < 1.0 {
-        (c, x, 0.0)
-    } else if h < 2.0 {
-        (x, c, 0.0)
-    } else if h < 3.0 {
-        (0.0, c, x)
-    } else if h < 4.0 {
-        (0.0, x, c)
-    } else if h < 5.0 {
-        (x, 0.0, c)
-    } else {
-        // h < 6.0
-        (c, 0.0, x)
-    };
+    let a = c * h.cos();
+    let b = c * h.sin();
 
-    let m = hsl.l - (c / 2.0);
+    // Oklab → LMS (nonlinear)
+    let l_ = l + 0.39633778 * a + 0.21580376 * b;
+    let m_ = l - 0.105561346 * a - 0.06385417 * b;
+    let s_ = l - 0.08948418 * a - 1.2914855 * b;
 
-    Color {
-        r: r1 + m,
-        g: g1 + m,
-        b: b1 + m,
-        a: hsl.a,
-    }
+    // Cubing back
+    let l = l_ * l_ * l_;
+    let m = m_ * m_ * m_;
+    let s = s_ * s_ * s_;
+
+    let r = 4.0767417 * l - 3.3077116 * m + 0.23096994 * s;
+    let g = -1.268438 * l + 2.6097574 * m - 0.34131938 * s;
+    let b = -0.0041960863 * l - 0.7034186 * m + 1.7076147 * s;
+
+    Color::from_linear_rgba(
+        r.clamp(0.0, 1.0),
+        g.clamp(0.0, 1.0),
+        b.clamp(0.0, 1.0),
+        alpha,
+    )
 }
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index 972ab731..24966211 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -441,7 +441,7 @@ pub fn primary(theme: &Theme) -> Style {
 /// Text conveying some secondary information, like a footnote.
 pub fn secondary(theme: &Theme) -> Style {
     Style {
-        color: Some(theme.extended_palette().secondary.strong.color),
+        color: Some(theme.extended_palette().secondary.base.color),
     }
 }
 
diff --git a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
index 188d6c67..adb46a04 100644
--- a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
@@ -1 +1 @@
-e440e5e00db4fff0a79251aaf493c4af86241196a746d9147a895d14f01b1283
\ No newline at end of file
+a496cc09220283466d5eb3635f6b63d011ec1dc765726b81213a823825836e4a
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index b72ceb65..4f164ab7 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-d81cf7c3974fc5b49251e8287c536fd3477c18e7afd3e9e42619364db7787fcc
\ No newline at end of file
+661e3f5313b98c65fd0ce9615d9a42201f2b1bafe0285b4a9c5c5af403782452
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
index 2cca5768..73859c52 100644
--- a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
@@ -1 +1 @@
-ad4fbda3cc3d60209320dd713b7be6b0a5e6b55650689d70ac563a0a81f2eefc
\ No newline at end of file
+a530ad9b59628d95e9aaa187af2681b26e7219786b5a114848f41690ed25ef21
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
index 4dd06594..75e14cfd 100644
--- a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
@@ -1 +1 @@
-3863252d1f15750d7f5375bd23e8363c6a70d77ac9aac853e3515f7ff5170bce
\ No newline at end of file
+f959b1b8ca2d7f87110e0decf63bf04bb685a8958de6879e008edb40415a84e8
\ No newline at end of file
diff --git a/examples/styling/snapshots/dark-tiny-skia.sha256 b/examples/styling/snapshots/dark-tiny-skia.sha256
index e8ae6200..59ea0058 100644
--- a/examples/styling/snapshots/dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/dark-tiny-skia.sha256
@@ -1 +1 @@
-c0bc58fcbde8e7ac4447ba4a454c5c2cb2c6d570e873897887c626b2dc07329b
\ No newline at end of file
+043d53e59e66ed06105abac613ed49c6beaf57f5009e605107cb77307807790b
\ No newline at end of file
diff --git a/examples/styling/snapshots/dracula-tiny-skia.sha256 b/examples/styling/snapshots/dracula-tiny-skia.sha256
index 4b48c1d2..3569448c 100644
--- a/examples/styling/snapshots/dracula-tiny-skia.sha256
+++ b/examples/styling/snapshots/dracula-tiny-skia.sha256
@@ -1 +1 @@
-1f17779b3291c133399f1eba9f7e517889108d60dbaa8d5b6cd024ad67ef1c8c
\ No newline at end of file
+f7894c6738710e8054b41c2d958eb50182d9655d8651d1fd2371a9ed05f28ddc
\ No newline at end of file
diff --git a/examples/styling/snapshots/ferra-tiny-skia.sha256 b/examples/styling/snapshots/ferra-tiny-skia.sha256
index 6ea26878..5caad7ab 100644
--- a/examples/styling/snapshots/ferra-tiny-skia.sha256
+++ b/examples/styling/snapshots/ferra-tiny-skia.sha256
@@ -1 +1 @@
-51d7bfc1af8ba7503b9800ae7eaaa660047d9b16b0bdc1e8a3850df1d9901652
\ No newline at end of file
+e0ec3911121e303bdfe3956c72af423ec21a17a958768116ee452adcace02e15
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
index 173efa4e..9c798964 100644
--- a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
@@ -1 +1 @@
-5423fa06a1dc73f9cce42447f3134768114e8321c8f2367da1e04db4d4673f52
\ No newline at end of file
+81e4f065fc985a2c5fc9d15fea941667e914dbc6fe7a5262dac5390955e34f67
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index b1b97fa5..d49549ed 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-b7ea69b9ce1f73694cccb8b0bc9acab35fc4dcedd01795e3897215c416550fc2
\ No newline at end of file
+9d91bfb3504ebf59881ca1554fa63f7293c2750f7ff15a91ff8e86ccf65a0f6f
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
index 3c6e8060..b02de3c1 100644
--- a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
@@ -1 +1 @@
-fa43206adec5dce05c4181ec5d9c71d15067dd3b1d7f5b3267c452cf1de2ca95
\ No newline at end of file
+491041848f77c6e9b70b7e677d0809bff5ceae783326f6dbdd10bdcd45eb56e2
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index 84c64e60..32759d28 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-5d7445700ff415428ae43d32ef30b279c38ddc6ffd0e3619ea28044b1d8c709b
\ No newline at end of file
+8209ef9862c56280f711a477843f6d9ab2d1b201ba257f553c9ad2caf0c78731
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
index b27cd469..2f1b3050 100644
--- a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
@@ -1 +1 @@
-52d424e4dfa3ae9b1195e95f17eb655675e4507ec8fb4e36372612fd57a5d86d
\ No newline at end of file
+304163accbfcd947b5231beaeb4d8194aab02409df9e334862fe5eb79a835116
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index 2c30b309..5e68c473 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-a0c84b36979f6a6f780af80689425b92a1b68743c39f8e519efcb11b46b9de42
\ No newline at end of file
+dd82fb5d72db1a33c52bbd27836dbed0c51af5a8bc726c4d73865af779701aba
\ No newline at end of file
diff --git a/examples/styling/snapshots/moonfly-tiny-skia.sha256 b/examples/styling/snapshots/moonfly-tiny-skia.sha256
index 377e0509..21d299eb 100644
--- a/examples/styling/snapshots/moonfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/moonfly-tiny-skia.sha256
@@ -1 +1 @@
-21820cf793f0a3af6fd339132b32cc77cbca52f1ca32f7ae334f74849a046ba8
\ No newline at end of file
+bc88452bb81a702a8c29c9dde933bf0bdb1723af1c910cb44e56180dc64270b5
\ No newline at end of file
diff --git a/examples/styling/snapshots/nightfly-tiny-skia.sha256 b/examples/styling/snapshots/nightfly-tiny-skia.sha256
index a4a22ca2..90c3b78a 100644
--- a/examples/styling/snapshots/nightfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/nightfly-tiny-skia.sha256
@@ -1 +1 @@
-1ba92e64ddcc5f5fc6f841d5fde961382099e7698a253ac93670b900287ee55c
\ No newline at end of file
+140ca7cf98bec0d955678b5160e0ccb43d85a829eed62c54f09d5e0b1a401e6f
\ No newline at end of file
diff --git a/examples/styling/snapshots/nord-tiny-skia.sha256 b/examples/styling/snapshots/nord-tiny-skia.sha256
index d1f4cf12..aa36b9a7 100644
--- a/examples/styling/snapshots/nord-tiny-skia.sha256
+++ b/examples/styling/snapshots/nord-tiny-skia.sha256
@@ -1 +1 @@
-f6559f58f9acae81d929ee1aa5f8db33fca9d4ff49d21acf1e627d891ed77565
\ No newline at end of file
+e8b2b050896d2b2cfd1c31b2c8773f74b2c23b94b3d94e8f16b8fb6604e8b2f2
\ No newline at end of file
diff --git a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
index 5cb7f75e..096bad4c 100644
--- a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
+++ b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
@@ -1 +1 @@
-d3d34b3b02b11156cb9a545d60cba078e78e4124c8f3ae61be66908a42799166
\ No newline at end of file
+d40514ab3f75e4aa08d8d21e197e5fa486dd0689a4e81027ae335e9abd2ea311
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
index 367d8198..93ec5161 100644
--- a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
@@ -1 +1 @@
-3c983866c4feaa10ed34206c1a4c98933e87ba6239849bd7e1b7876f6c9596e7
\ No newline at end of file
+3ea703ef5d769c6184777bee6caa71e49adc381e1a47f3241f03250ab27b6988
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index bf7fb05b..4d5150b3 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-dc6fc66e651d938a42f0a9c642a99e33865b87aefc3fdeafa1848f6a3fab20c3
\ No newline at end of file
+73f01efd56087daa9372aed4b5e5d72d8f5713d75812978bf09a726684ea2b40
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
index 5685ce2f..99686307 100644
--- a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
@@ -1 +1 @@
-7104099471f9c712f00cd2ac80e150e10f7d21604d7edc6b13181e74d42eb877
\ No newline at end of file
+82a173e0c1b9c665fbf06de60acbb0523b7f9ab5af429d5ec29ce908f640d5ec
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index 2efd8415..69c59503 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-263b5eb190d7db2ab0a67dc8b73778d9130755b07a8295345c758e158fb52881
\ No newline at end of file
+91d09c382a9d615a1ba68f74463c9a92baba705e35bb84173945d2fa5fd240d0
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
index c8a8d1ed..ed8f662b 100644
--- a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
@@ -1 +1 @@
-6fd5700c7a63ba004957601e0d91b02e8d08b710cff81710d3b8cd1cb668faa6
\ No newline at end of file
+dfc3317f39c204b8509c1b8f7e8e1d9b0911bfc1a7bd5fbde822a7a5c6c54e12
\ No newline at end of file
diff --git a/widget/src/button.rs b/widget/src/button.rs
index 37c07169..ac4a27cb 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -718,13 +718,13 @@ pub fn subtle(theme: &Theme, status: Status) -> Style {
         Status::Active => base,
         Status::Pressed => Style {
             background: Some(Background::Color(
-                palette.background.strongest.color,
+                palette.background.strong.color,
             )),
             ..base
         },
         Status::Hovered => Style {
             background: Some(Background::Color(
-                palette.background.strong.color,
+                palette.background.weaker.color,
             )),
             ..base
         },
diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 4e1d594c..b8cee500 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -1423,7 +1423,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
             color: palette.background.strong.color,
         },
         icon: palette.background.weak.text,
-        placeholder: palette.background.strong.color,
+        placeholder: palette.secondary.base.color,
         value: palette.background.base.text,
         selection: palette.primary.weak.color,
     };
@@ -1447,6 +1447,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
         Status::Disabled => Style {
             background: Background::Color(palette.background.weak.color),
             value: active.placeholder,
+            placeholder: palette.background.strongest.color,
             ..active
         },
     }
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index ba15e916..3e849175 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -1817,10 +1817,10 @@ pub fn default(theme: &Theme, status: Status) -> Style {
         border: Border {
             radius: 2.0.into(),
             width: 1.0,
-            color: palette.background.strongest.color,
+            color: palette.background.strong.color,
         },
         icon: palette.background.weak.text,
-        placeholder: palette.background.strongest.color,
+        placeholder: palette.secondary.base.color,
         value: palette.background.base.text,
         selection: palette.primary.weak.color,
     };
@@ -1844,6 +1844,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
         Status::Disabled => Style {
             background: Background::Color(palette.background.weak.color),
             value: active.placeholder,
+            placeholder: palette.background.strongest.color,
             ..active
         },
     }

From 6e78bea2d2f99d497c4266932f472b6b7a118330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 5 Aug 2025 10:06:38 +0200
Subject: [PATCH 30/43] Remove `bump` hack in `theme::palette`

---
 core/src/theme/palette.rs                                 | 8 +++-----
 .../styling/snapshots/catppuccin_latte-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 | 2 +-
 .../styling/snapshots/kanagawa_lotus-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/light-tiny-skia.sha256         | 2 +-
 .../styling/snapshots/solarized_light-tiny-skia.sha256    | 2 +-
 .../styling/snapshots/tokyo_night_light-tiny-skia.sha256  | 2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index 96a48695..dfd8acf0 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -525,11 +525,9 @@ pub struct Secondary {
 impl Secondary {
     /// Generates a set of [`Secondary`] colors from the base and text colors.
     pub fn generate(base: Color, text: Color) -> Self {
-        let bump = if is_dark(base) { 0.0 } else { 0.01 };
-
-        let weak = mix(deviate(base, 0.1 + bump), text, 0.4);
-        let base = mix(deviate(base, 0.3 + bump), text, 0.4);
-        let strong = mix(deviate(base, 0.5 + bump), text, 0.4);
+        let weak = mix(deviate(base, 0.1), text, 0.4);
+        let base = mix(deviate(base, 0.3), text, 0.4);
+        let strong = mix(deviate(base, 0.5), text, 0.4);
 
         Self {
             base: Pair::new(base, text),
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index 4f164ab7..9fe9007a 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-661e3f5313b98c65fd0ce9615d9a42201f2b1bafe0285b4a9c5c5af403782452
\ No newline at end of file
+46f6341d1e3f63ddb4a6a9a11f0efee4dcb076861c351258a3d29095d67c170d
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index d49549ed..8672a54b 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-9d91bfb3504ebf59881ca1554fa63f7293c2750f7ff15a91ff8e86ccf65a0f6f
\ No newline at end of file
+3131fd97275095e2c562341e3b0b13dfbed45e2461595b692f20dae0e5941dba
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index 32759d28..cc334448 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-8209ef9862c56280f711a477843f6d9ab2d1b201ba257f553c9ad2caf0c78731
\ No newline at end of file
+59a02d3278a9f321731c11c182edc897f87c2703af5f14a6e76dbea6e505fcc6
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index 5e68c473..0a1e8669 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-dd82fb5d72db1a33c52bbd27836dbed0c51af5a8bc726c4d73865af779701aba
\ No newline at end of file
+b61b166bca3dce77002300e60ae778000ea00df5b5973f106ce58ce6d5e0b501
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index 4d5150b3..93cb2d82 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-73f01efd56087daa9372aed4b5e5d72d8f5713d75812978bf09a726684ea2b40
\ No newline at end of file
+ce493d0c75ecce3eedb82c459c6d3ac674a4f8ee0bdaf3a912ff8ef8e57e5b32
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index 69c59503..bf0eea38 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-91d09c382a9d615a1ba68f74463c9a92baba705e35bb84173945d2fa5fd240d0
\ No newline at end of file
+40441bc94b7c524c5064ff155a0db28d896109c3cce4da6822efefd71b3a9a92
\ No newline at end of file

From e14d3609ac1d2d64424cf294c07bfa8882c8d964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 5 Aug 2025 10:07:10 +0200
Subject: [PATCH 31/43] Fix unnecessary parentheses in `winit::conversion`

---
 winit/src/conversion.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index ab84afff..4b9fcc0d 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -289,7 +289,7 @@ pub fn window_event(
             Ime::Enabled => input_method::Event::Opened,
             Ime::Preedit(content, size) => input_method::Event::Preedit(
                 content,
-                size.map(|(start, end)| (start..end)),
+                size.map(|(start, end)| start..end),
             ),
             Ime::Commit(content) => input_method::Event::Commit(content),
             Ime::Disabled => input_method::Event::Closed,

From 4d4f565da71e923f74ea51240bfa4e48adf84887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 5 Aug 2025 22:04:35 +0200
Subject: [PATCH 32/43] Try to make light themes a bit more colorful

---
 core/src/theme/palette.rs                          |  6 +++++-
 .../snapshots/catppuccin_latte-tiny-skia.sha256    |  2 +-
 .../snapshots/gruvbox_light-tiny-skia.sha256       |  2 +-
 .../snapshots/kanagawa_lotus-tiny-skia.sha256      |  2 +-
 .../snapshots/solarized_light-tiny-skia.sha256     |  2 +-
 .../snapshots/tokyo_night_light-tiny-skia.sha256   |  2 +-
 examples/styling/src/main.rs                       | 14 ++++++++------
 widget/src/text_editor.rs                          |  3 ---
 8 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index dfd8acf0..24e15a9e 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -623,7 +623,10 @@ fn darken(color: Color, amount: f32) -> Color {
     let mut oklch = to_oklch(color);
 
     // We try to bump the chroma a bit for more colorful palettes
-    oklch.c *= 1.0 + 2.0 * amount / oklch.l.max(0.05);
+    if oklch.c > 0.0 {
+        // Formula empirically and cluelessly derived
+        oklch.c *= 1.0 + (0.3 / oklch.c).min(100.0) * amount;
+    }
 
     oklch.l = if oklch.l - amount < 0.0 {
         0.0
@@ -638,6 +641,7 @@ fn lighten(color: Color, amount: f32) -> Color {
     let mut oklch = to_oklch(color);
 
     // We try to bump the chroma a bit for more colorful palettes
+    // Formula empirically and cluelessly derived
     oklch.c *= 1.0 + 2.0 * amount / oklch.l.max(0.05);
 
     oklch.l = if oklch.l + amount > 1.0 {
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index 9fe9007a..6e3df4fc 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-46f6341d1e3f63ddb4a6a9a11f0efee4dcb076861c351258a3d29095d67c170d
\ No newline at end of file
+045ee6f1580e728919431e5ae741b50277b96cb97089ad3bf2a0e2aefd9e0090
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index 8672a54b..76b632c1 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-3131fd97275095e2c562341e3b0b13dfbed45e2461595b692f20dae0e5941dba
\ No newline at end of file
+09cb020de17de0695c3a383972af3562e49d87dcfc5bcf8f1459b19f8874834a
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index cc334448..49bace10 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-59a02d3278a9f321731c11c182edc897f87c2703af5f14a6e76dbea6e505fcc6
\ No newline at end of file
+ddc366fdf1127014a47d18a8914b6e9967eada10fae48a03b10c9428c589c51f
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index 93cb2d82..ce985f2c 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-ce493d0c75ecce3eedb82c459c6d3ac674a4f8ee0bdaf3a912ff8ef8e57e5b32
\ No newline at end of file
+9af0d10bb6b71fae760d9993e7ba6f9431002a376c6c064ac0e0738499f4e359
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index bf0eea38..300f2eac 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-40441bc94b7c524c5064ff155a0db28d896109c3cce4da6822efefd71b3a9a92
\ No newline at end of file
+e2d049e13e1d88c9fd046803936c27e9a45809f133d8ea58d4731626594a87a3
\ No newline at end of file
diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs
index 934b9f5d..0ba4e20f 100644
--- a/examples/styling/src/main.rs
+++ b/examples/styling/src/main.rs
@@ -1,8 +1,8 @@
 use iced::keyboard;
 use iced::widget::{
-    button, center, checkbox, column, container, horizontal_rule, pick_list,
-    progress_bar, row, scrollable, slider, text, text_input, toggler,
-    vertical_rule, vertical_space,
+    button, center_x, center_y, checkbox, column, container, horizontal_rule,
+    pick_list, progress_bar, row, scrollable, slider, text, text_input,
+    toggler, vertical_rule, vertical_space,
 };
 use iced::{Center, Element, Fill, Subscription, Theme};
 
@@ -94,7 +94,7 @@ impl Styling {
 
         let progress_bar = || progress_bar(0.0..=100.0, self.slider_value);
 
-        let scrollable = scrollable(column![
+        let scroll_me = scrollable(column![
             "Scroll me!",
             vertical_space().height(800),
             "You did it!"
@@ -134,7 +134,7 @@ impl Styling {
             slider(),
             progress_bar(),
             row![
-                scrollable,
+                scroll_me,
                 row![vertical_rule(1), column![checkbox, toggler].spacing(20)]
                     .spacing(20)
             ]
@@ -147,7 +147,9 @@ impl Styling {
         .padding(20)
         .max_width(600);
 
-        center(content).into()
+        center_y(scrollable(center_x(content)).spacing(10))
+            .padding(10)
+            .into()
     }
 
     fn subscription(&self) -> Subscription<Message> {
diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index b8cee500..451072a8 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -1374,8 +1374,6 @@ pub struct Style {
     pub background: Background,
     /// The [`Border`] of the text input.
     pub border: Border,
-    /// The [`Color`] of the icon of the text input.
-    pub icon: Color,
     /// The [`Color`] of the placeholder of the text input.
     pub placeholder: Color,
     /// The [`Color`] of the value of the text input.
@@ -1422,7 +1420,6 @@ pub fn default(theme: &Theme, status: Status) -> Style {
             width: 1.0,
             color: palette.background.strong.color,
         },
-        icon: palette.background.weak.text,
         placeholder: palette.secondary.base.color,
         value: palette.background.base.text,
         selection: palette.primary.weak.color,

From a8e2956f7483092b7b9d96aa5135604d1433a086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 5 Aug 2025 22:05:51 +0200
Subject: [PATCH 33/43] Enable `crisp` feature by default :tada:

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index e1f0c671..6fed9896 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ all-features = true
 maintenance = { status = "actively-developed" }
 
 [features]
-default = ["wgpu", "tiny-skia", "web-colors", "auto-detect-theme", "thread-pool"]
+default = ["wgpu", "tiny-skia", "crisp", "web-colors", "auto-detect-theme", "thread-pool"]
 # Enables the `wgpu` GPU-accelerated renderer backend
 wgpu = ["iced_renderer/wgpu", "iced_widget/wgpu"]
 # Enables the `tiny-skia` software renderer backend

From 35df95e988de2df9cf6098c2ff6ed23fcc6de1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Tue, 5 Aug 2025 22:20:30 +0200
Subject: [PATCH 34/43] Fix broken intra-doc link in `graphics::text`

---
 graphics/src/text.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/src/text.rs b/graphics/src/text.rs
index d2514c90..e00b3ac7 100644
--- a/graphics/src/text.rs
+++ b/graphics/src/text.rs
@@ -176,7 +176,7 @@ impl FontSystem {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
 pub struct Version(u32);
 
-/// A weak reference to a [`cosmic-text::Buffer`] that can be drawn.
+/// A weak reference to a [`cosmic_text::Buffer`] that can be drawn.
 #[derive(Debug, Clone)]
 pub struct Raw {
     /// A weak reference to a [`cosmic_text::Buffer`].

From 468014a1841fb89602248c7d95ad50b3a550859d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 6 Aug 2025 02:42:51 +0200
Subject: [PATCH 35/43] Fix minor styling inconsistencies in some widgets

---
 core/src/theme/palette.rs                     |  4 +--
 .../catppuccin_frappé-tiny-skia.sha256        |  2 +-
 .../catppuccin_latte-tiny-skia.sha256         |  2 +-
 .../catppuccin_macchiato-tiny-skia.sha256     |  2 +-
 .../catppuccin_mocha-tiny-skia.sha256         |  2 +-
 .../styling/snapshots/dark-tiny-skia.sha256   |  2 +-
 .../snapshots/dracula-tiny-skia.sha256        |  2 +-
 .../styling/snapshots/ferra-tiny-skia.sha256  |  2 +-
 .../snapshots/gruvbox_dark-tiny-skia.sha256   |  2 +-
 .../snapshots/gruvbox_light-tiny-skia.sha256  |  2 +-
 .../kanagawa_dragon-tiny-skia.sha256          |  2 +-
 .../snapshots/kanagawa_lotus-tiny-skia.sha256 |  2 +-
 .../snapshots/kanagawa_wave-tiny-skia.sha256  |  2 +-
 .../styling/snapshots/light-tiny-skia.sha256  |  2 +-
 .../snapshots/moonfly-tiny-skia.sha256        |  2 +-
 .../snapshots/nightfly-tiny-skia.sha256       |  2 +-
 .../styling/snapshots/nord-tiny-skia.sha256   |  2 +-
 .../snapshots/oxocarbon-tiny-skia.sha256      |  2 +-
 .../snapshots/solarized_dark-tiny-skia.sha256 |  2 +-
 .../solarized_light-tiny-skia.sha256          |  2 +-
 .../snapshots/tokyo_night-tiny-skia.sha256    |  2 +-
 .../tokyo_night_light-tiny-skia.sha256        |  2 +-
 .../tokyo_night_storm-tiny-skia.sha256        |  2 +-
 widget/src/checkbox.rs                        | 29 ++++++++++++++-----
 widget/src/pick_list.rs                       |  2 +-
 widget/src/scrollable.rs                      |  2 +-
 widget/src/toggler.rs                         |  2 +-
 27 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index 24e15a9e..08a80a26 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -623,9 +623,9 @@ fn darken(color: Color, amount: f32) -> Color {
     let mut oklch = to_oklch(color);
 
     // We try to bump the chroma a bit for more colorful palettes
-    if oklch.c > 0.0 {
+    if oklch.c > 0.0 && oklch.c < (1.0 - oklch.l) / 2.0 {
         // Formula empirically and cluelessly derived
-        oklch.c *= 1.0 + (0.3 / oklch.c).min(100.0) * amount;
+        oklch.c *= 1.0 + (0.2 / oklch.c).min(100.0) * amount;
     }
 
     oklch.l = if oklch.l - amount < 0.0 {
diff --git a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
index adb46a04..7be535ed 100644
--- a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
@@ -1 +1 @@
-a496cc09220283466d5eb3635f6b63d011ec1dc765726b81213a823825836e4a
\ No newline at end of file
+aeecd43f0921fe9f0ea3358cc3d55040e1b3117e43eb4490d621b0af71680899
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index 6e3df4fc..39882a5b 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-045ee6f1580e728919431e5ae741b50277b96cb97089ad3bf2a0e2aefd9e0090
\ No newline at end of file
+121fd6018015dbc5e6c8f5c2db1197a7dc769a916fb29ef9f42622b4cf63a96c
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
index 73859c52..2197655b 100644
--- a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
@@ -1 +1 @@
-a530ad9b59628d95e9aaa187af2681b26e7219786b5a114848f41690ed25ef21
\ No newline at end of file
+56df225c9404745aae11734fcd13b062355a1d26198323711888c49b528bdfae
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
index 75e14cfd..542012dc 100644
--- a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
@@ -1 +1 @@
-f959b1b8ca2d7f87110e0decf63bf04bb685a8958de6879e008edb40415a84e8
\ No newline at end of file
+a15a385aefc14ddd988536ee6eb81b7d6ececafbc7a7af4a5c282266c4f69d07
\ No newline at end of file
diff --git a/examples/styling/snapshots/dark-tiny-skia.sha256 b/examples/styling/snapshots/dark-tiny-skia.sha256
index 59ea0058..5e28ca02 100644
--- a/examples/styling/snapshots/dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/dark-tiny-skia.sha256
@@ -1 +1 @@
-043d53e59e66ed06105abac613ed49c6beaf57f5009e605107cb77307807790b
\ No newline at end of file
+95630596cd95dbe070c20d3eec0bb131f5b0b05e1afa8c07a38cedd4775cfff8
\ No newline at end of file
diff --git a/examples/styling/snapshots/dracula-tiny-skia.sha256 b/examples/styling/snapshots/dracula-tiny-skia.sha256
index 3569448c..44ebe62e 100644
--- a/examples/styling/snapshots/dracula-tiny-skia.sha256
+++ b/examples/styling/snapshots/dracula-tiny-skia.sha256
@@ -1 +1 @@
-f7894c6738710e8054b41c2d958eb50182d9655d8651d1fd2371a9ed05f28ddc
\ No newline at end of file
+fe0a3defebea5e0d728abec9f7395cced9d5fe46d1e64523afe649774fb7dc3e
\ No newline at end of file
diff --git a/examples/styling/snapshots/ferra-tiny-skia.sha256 b/examples/styling/snapshots/ferra-tiny-skia.sha256
index 5caad7ab..657e0dd8 100644
--- a/examples/styling/snapshots/ferra-tiny-skia.sha256
+++ b/examples/styling/snapshots/ferra-tiny-skia.sha256
@@ -1 +1 @@
-e0ec3911121e303bdfe3956c72af423ec21a17a958768116ee452adcace02e15
\ No newline at end of file
+840c1eff30f6dc63cf3e7f19e2cd0acd31b0b3eb2bf0773000aef5b9a46d9df6
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
index 9c798964..1da1b8c7 100644
--- a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
@@ -1 +1 @@
-81e4f065fc985a2c5fc9d15fea941667e914dbc6fe7a5262dac5390955e34f67
\ No newline at end of file
+7d4c6ae83e8436b1d4e850c82f19e97a911b4ce389a4ba75f8ea722ffc51329a
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index 76b632c1..98e9dbfd 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-09cb020de17de0695c3a383972af3562e49d87dcfc5bcf8f1459b19f8874834a
\ No newline at end of file
+36ab94c5f69c09ef60feb4524e0a593d2670e345d71139b783796496bdcbceb0
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
index b02de3c1..cf6fbeac 100644
--- a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
@@ -1 +1 @@
-491041848f77c6e9b70b7e677d0809bff5ceae783326f6dbdd10bdcd45eb56e2
\ No newline at end of file
+262314758d1facbc16b4949c92ba58dd95a10bdf1fe85fa7aa336dcdf536ab85
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index 49bace10..b0e8b1d5 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-ddc366fdf1127014a47d18a8914b6e9967eada10fae48a03b10c9428c589c51f
\ No newline at end of file
+fbafd69c60962465f4e0759fc72b3f5bb13895e85821273fff4b51ad1994e7ba
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
index 2f1b3050..9a502d0f 100644
--- a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
@@ -1 +1 @@
-304163accbfcd947b5231beaeb4d8194aab02409df9e334862fe5eb79a835116
\ No newline at end of file
+6a237b0387d6621c835521d560b1e56b2c63ca1ebca8256742b0afea3c71725c
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index 0a1e8669..cd41d1b8 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-b61b166bca3dce77002300e60ae778000ea00df5b5973f106ce58ce6d5e0b501
\ No newline at end of file
+a1832dfc240eac78bafcdfdbe36fc66b35f984cf67d71adb265fc4f30d383e2b
\ No newline at end of file
diff --git a/examples/styling/snapshots/moonfly-tiny-skia.sha256 b/examples/styling/snapshots/moonfly-tiny-skia.sha256
index 21d299eb..f3c9d57d 100644
--- a/examples/styling/snapshots/moonfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/moonfly-tiny-skia.sha256
@@ -1 +1 @@
-bc88452bb81a702a8c29c9dde933bf0bdb1723af1c910cb44e56180dc64270b5
\ No newline at end of file
+82e617ffb6f5805014377e0b9094b91827de14fa919855d4c6443267291ca677
\ No newline at end of file
diff --git a/examples/styling/snapshots/nightfly-tiny-skia.sha256 b/examples/styling/snapshots/nightfly-tiny-skia.sha256
index 90c3b78a..3745dd49 100644
--- a/examples/styling/snapshots/nightfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/nightfly-tiny-skia.sha256
@@ -1 +1 @@
-140ca7cf98bec0d955678b5160e0ccb43d85a829eed62c54f09d5e0b1a401e6f
\ No newline at end of file
+3cae3ed606e1927ef9aaba7e498a54b62ea70d114f0011a048192a2743accbef
\ No newline at end of file
diff --git a/examples/styling/snapshots/nord-tiny-skia.sha256 b/examples/styling/snapshots/nord-tiny-skia.sha256
index aa36b9a7..52e996e5 100644
--- a/examples/styling/snapshots/nord-tiny-skia.sha256
+++ b/examples/styling/snapshots/nord-tiny-skia.sha256
@@ -1 +1 @@
-e8b2b050896d2b2cfd1c31b2c8773f74b2c23b94b3d94e8f16b8fb6604e8b2f2
\ No newline at end of file
+8daec0d941ecc2eb52135b63a91936786ef2af48d56fba2d192e00438230ae0b
\ No newline at end of file
diff --git a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
index 096bad4c..356e9b0b 100644
--- a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
+++ b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
@@ -1 +1 @@
-d40514ab3f75e4aa08d8d21e197e5fa486dd0689a4e81027ae335e9abd2ea311
\ No newline at end of file
+d0bd8d738130d56857e618efbd9e11b515aa0655e2edf8dc2326b8dabf54c490
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
index 93ec5161..f8475616 100644
--- a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
@@ -1 +1 @@
-3ea703ef5d769c6184777bee6caa71e49adc381e1a47f3241f03250ab27b6988
\ No newline at end of file
+d1c06a7016554e03308c0a642ea0edf17e397b639aa9194c2314b0e32d8165ff
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index ce985f2c..213ee947 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-9af0d10bb6b71fae760d9993e7ba6f9431002a376c6c064ac0e0738499f4e359
\ No newline at end of file
+c8596fa0d72e96e144de58953e7a8ef7c37b88625070642747769af1104a0050
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
index 99686307..4700021e 100644
--- a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
@@ -1 +1 @@
-82a173e0c1b9c665fbf06de60acbb0523b7f9ab5af429d5ec29ce908f640d5ec
\ No newline at end of file
+c831821798f5fe38609a7fe854a3785942ae04750ed23936f32b33139126e195
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index 300f2eac..a26fd224 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-e2d049e13e1d88c9fd046803936c27e9a45809f133d8ea58d4731626594a87a3
\ No newline at end of file
+26c9d551330f5dbe6680f1c9e8cdf3b6810c26c9de3b22a9a948eae16d5fa3d9
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
index ed8f662b..27013156 100644
--- a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
@@ -1 +1 @@
-dfc3317f39c204b8509c1b8f7e8e1d9b0911bfc1a7bd5fbde822a7a5c6c54e12
\ No newline at end of file
+5660044597f3ca9e10f5f704cfd4723e7c68f1d211c999063134aa8576227757
\ No newline at end of file
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 8fce8b1d..91c87ac0 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -556,20 +556,23 @@ pub fn primary(theme: &Theme, status: Status) -> Style {
 
     match status {
         Status::Active { is_checked } => styled(
-            palette.background.strongest.color,
+            palette.background.strong.color,
             palette.background.base,
+            palette.primary.base.text,
             palette.primary.base,
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            palette.background.strongest.color,
+            palette.background.strong.color,
             palette.background.weak,
+            palette.primary.base.text,
             palette.primary.strong,
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
             palette.background.weak.color,
             palette.background.weak,
+            palette.primary.base.text,
             palette.background.strong,
             is_checked,
         ),
@@ -582,20 +585,23 @@ pub fn secondary(theme: &Theme, status: Status) -> Style {
 
     match status {
         Status::Active { is_checked } => styled(
-            palette.background.strongest.color,
+            palette.background.strong.color,
             palette.background.base,
+            palette.background.base.text,
             palette.background.strong,
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            palette.background.strongest.color,
+            palette.background.strong.color,
             palette.background.weak,
+            palette.background.base.text,
             palette.background.strong,
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
             palette.background.weak.color,
             palette.background.weak,
+            palette.background.base.text,
             palette.background.weak,
             is_checked,
         ),
@@ -610,18 +616,21 @@ pub fn success(theme: &Theme, status: Status) -> Style {
         Status::Active { is_checked } => styled(
             palette.background.weak.color,
             palette.background.base,
+            palette.success.base.text,
             palette.success.base,
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            palette.background.strongest.color,
+            palette.background.strong.color,
             palette.background.weak,
+            palette.success.base.text,
             palette.success.strong,
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
             palette.background.weak.color,
             palette.background.weak,
+            palette.success.base.text,
             palette.success.weak,
             is_checked,
         ),
@@ -634,20 +643,23 @@ pub fn danger(theme: &Theme, status: Status) -> Style {
 
     match status {
         Status::Active { is_checked } => styled(
-            palette.background.strongest.color,
+            palette.background.strong.color,
             palette.background.base,
+            palette.danger.base.text,
             palette.danger.base,
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            palette.background.strongest.color,
+            palette.background.strong.color,
             palette.background.weak,
+            palette.danger.base.text,
             palette.danger.strong,
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
             palette.background.weak.color,
             palette.background.weak,
+            palette.danger.base.text,
             palette.danger.weak,
             is_checked,
         ),
@@ -657,6 +669,7 @@ pub fn danger(theme: &Theme, status: Status) -> Style {
 fn styled(
     border_color: Color,
     base: palette::Pair,
+    icon_color: Color,
     accent: palette::Pair,
     is_checked: bool,
 ) -> Style {
@@ -668,7 +681,7 @@ fn styled(
 
     Style {
         background: Background::Color(background.color),
-        icon_color: background.text,
+        icon_color,
         border: Border {
             radius: 2.0.into(),
             width: 1.0,
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs
index 517ff35d..4076d7f7 100644
--- a/widget/src/pick_list.rs
+++ b/widget/src/pick_list.rs
@@ -899,7 +899,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
     let active = Style {
         text_color: palette.background.weak.text,
         background: palette.background.weak.color.into(),
-        placeholder_color: palette.background.strong.color,
+        placeholder_color: palette.secondary.base.color,
         handle_color: palette.background.weak.text,
         border: Border {
             radius: 2.0.into(),
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 01c4ef7c..61e78d50 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -2069,7 +2069,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
         background: Some(palette.background.weak.color.into()),
         border: border::rounded(2),
         scroller: Scroller {
-            color: palette.background.strong.color,
+            color: palette.background.strongest.color,
             border: border::rounded(2),
         },
     };
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index 7f6e6795..41e4bd64 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -556,7 +556,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
             if is_toggled {
                 palette.primary.base.color
             } else {
-                palette.background.strongest.color
+                palette.background.strong.color
             }
         }
         Status::Disabled => palette.background.weak.color,

From 0037699dda1599475b83b191365e89559277e90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 6 Aug 2025 03:36:39 +0200
Subject: [PATCH 36/43] Increase `period` in `gallery` example to `Month`

---
 examples/gallery/src/civitai.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/gallery/src/civitai.rs b/examples/gallery/src/civitai.rs
index 1102acae..b24b1031 100644
--- a/examples/gallery/src/civitai.rs
+++ b/examples/gallery/src/civitai.rs
@@ -29,7 +29,7 @@ impl Image {
             .get("https://civitai.com/api/v1/images")
             .query(&[
                 ("sort", "Most Reactions"),
-                ("period", "Week"),
+                ("period", "Month"),
                 ("nsfw", "None"),
                 ("limit", &Image::LIMIT.to_string()),
             ])

From 3f22d5683a03f0bc7006744b04a50b4bc38f2918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 6 Aug 2025 05:55:33 +0200
Subject: [PATCH 37/43] Expose `relative_luminance` as part of `Color`

---
 core/src/color.rs         |  7 +++++++
 core/src/theme/palette.rs | 10 ++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/src/color.rs b/core/src/color.rs
index 65a47781..ad60592a 100644
--- a/core/src/color.rs
+++ b/core/src/color.rs
@@ -195,6 +195,13 @@ impl Color {
             ..self
         }
     }
+
+    /// Returns the relative luminance of the [`Color`].
+    /// https://www.w3.org/TR/WCAG21/#dfn-relative-luminance
+    pub fn relative_luminance(self) -> f32 {
+        let linear = self.into_linear();
+        0.2126 * linear[0] + 0.7152 * linear[1] + 0.0722 * linear[2]
+    }
 }
 
 impl From<[f32; 3]> for Color {
diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index 08a80a26..77189730 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -716,17 +716,11 @@ fn is_readable(a: Color, b: Color) -> bool {
 
 // https://www.w3.org/TR/WCAG21/#dfn-contrast-ratio
 fn relative_contrast(a: Color, b: Color) -> f32 {
-    let lum_a = relative_luminance(a);
-    let lum_b = relative_luminance(b);
+    let lum_a = a.relative_luminance();
+    let lum_b = b.relative_luminance();
     (lum_a.max(lum_b) + 0.05) / (lum_a.min(lum_b) + 0.05)
 }
 
-// https://www.w3.org/TR/WCAG21/#dfn-relative-luminance
-fn relative_luminance(color: Color) -> f32 {
-    let linear = color.into_linear();
-    0.2126 * linear[0] + 0.7152 * linear[1] + 0.0722 * linear[2]
-}
-
 // https://en.wikipedia.org/wiki/Oklab_color_space#Conversions_between_color_spaces
 fn to_oklch(color: Color) -> Oklch {
     let [r, g, b, alpha] = color.into_linear();

From acbb8920de3e07c28c0e99e2f632f1a31a707e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 6 Aug 2025 18:46:11 +0200
Subject: [PATCH 38/43] Add `neutral` background shade between `weak` and
 `strong`

---
 core/src/theme/palette.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index 77189730..453c1ff3 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -456,6 +456,8 @@ pub struct Background {
     pub weaker: Pair,
     /// A weak version of the base background color.
     pub weak: Pair,
+    /// A neutral version of the base background color, between weak and strong.
+    pub neutral: Pair,
     /// A strong version of the base background color.
     pub strong: Pair,
     /// A stronger version of the base background color.
@@ -470,6 +472,7 @@ impl Background {
         let weakest = deviate(base, 0.03);
         let weaker = deviate(base, 0.07);
         let weak = deviate(base, 0.1);
+        let neutral = deviate(base, 0.125);
         let strong = deviate(base, 0.15);
         let stronger = deviate(base, 0.175);
         let strongest = deviate(base, 0.20);
@@ -479,6 +482,7 @@ impl Background {
             weakest: Pair::new(weakest, text),
             weaker: Pair::new(weaker, text),
             weak: Pair::new(weak, text),
+            neutral: Pair::new(neutral, text),
             strong: Pair::new(strong, text),
             stronger: Pair::new(stronger, text),
             strongest: Pair::new(strongest, text),

From af3125842d481c18121078217fad8a4176a4a85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 6 Aug 2025 18:46:39 +0200
Subject: [PATCH 39/43] Reduce `text` influence over `secondary` color

---
 core/src/theme/palette.rs                                     | 4 ++--
 examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 | 2 +-
 examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256  | 2 +-
 .../styling/snapshots/catppuccin_macchiato-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256  | 2 +-
 examples/styling/snapshots/dark-tiny-skia.sha256              | 2 +-
 examples/styling/snapshots/dracula-tiny-skia.sha256           | 2 +-
 examples/styling/snapshots/ferra-tiny-skia.sha256             | 2 +-
 examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256      | 2 +-
 examples/styling/snapshots/gruvbox_light-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256    | 2 +-
 examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/light-tiny-skia.sha256             | 2 +-
 examples/styling/snapshots/moonfly-tiny-skia.sha256           | 2 +-
 examples/styling/snapshots/nightfly-tiny-skia.sha256          | 2 +-
 examples/styling/snapshots/nord-tiny-skia.sha256              | 2 +-
 examples/styling/snapshots/oxocarbon-tiny-skia.sha256         | 2 +-
 examples/styling/snapshots/solarized_dark-tiny-skia.sha256    | 2 +-
 examples/styling/snapshots/solarized_light-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/tokyo_night-tiny-skia.sha256       | 2 +-
 examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 | 2 +-
 examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 | 2 +-
 23 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index 453c1ff3..9b3df4db 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -529,8 +529,8 @@ pub struct Secondary {
 impl Secondary {
     /// Generates a set of [`Secondary`] colors from the base and text colors.
     pub fn generate(base: Color, text: Color) -> Self {
-        let weak = mix(deviate(base, 0.1), text, 0.4);
-        let base = mix(deviate(base, 0.3), text, 0.4);
+        let weak = mix(deviate(base, 0.1), text, 0.2);
+        let base = mix(deviate(base, 0.3), text, 0.3);
         let strong = mix(deviate(base, 0.5), text, 0.4);
 
         Self {
diff --git a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
index 7be535ed..49055fe7 100644
--- a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
@@ -1 +1 @@
-aeecd43f0921fe9f0ea3358cc3d55040e1b3117e43eb4490d621b0af71680899
\ No newline at end of file
+a9dbcf00a56523cb77a48a860337d703e121b3043f918a89a7430b3fe974ed6f
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index 39882a5b..ed851b89 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-121fd6018015dbc5e6c8f5c2db1197a7dc769a916fb29ef9f42622b4cf63a96c
\ No newline at end of file
+e949dfd23b9921f042d7878afc0c5919d1e8ddb89f25084c348ca90d3da164f4
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
index 2197655b..6f40c0e7 100644
--- a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
@@ -1 +1 @@
-56df225c9404745aae11734fcd13b062355a1d26198323711888c49b528bdfae
\ No newline at end of file
+26892d6343cc78505a6964194c2c88f804f2c839672dd445b90ee08f2145fb59
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
index 542012dc..a8091fe2 100644
--- a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
@@ -1 +1 @@
-a15a385aefc14ddd988536ee6eb81b7d6ececafbc7a7af4a5c282266c4f69d07
\ No newline at end of file
+f07ddc4dae94892e59ae9a5ea557dc45a545b7507aee48b5b6eecec060aa436a
\ No newline at end of file
diff --git a/examples/styling/snapshots/dark-tiny-skia.sha256 b/examples/styling/snapshots/dark-tiny-skia.sha256
index 5e28ca02..4bb1ba65 100644
--- a/examples/styling/snapshots/dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/dark-tiny-skia.sha256
@@ -1 +1 @@
-95630596cd95dbe070c20d3eec0bb131f5b0b05e1afa8c07a38cedd4775cfff8
\ No newline at end of file
+8954349935620f4f207806ba3e991cab14d38c06212adb9cc60c3d205643277f
\ No newline at end of file
diff --git a/examples/styling/snapshots/dracula-tiny-skia.sha256 b/examples/styling/snapshots/dracula-tiny-skia.sha256
index 44ebe62e..d38944fe 100644
--- a/examples/styling/snapshots/dracula-tiny-skia.sha256
+++ b/examples/styling/snapshots/dracula-tiny-skia.sha256
@@ -1 +1 @@
-fe0a3defebea5e0d728abec9f7395cced9d5fe46d1e64523afe649774fb7dc3e
\ No newline at end of file
+c33c96a485bf846250b50c6bc401689a5adcc7414646230622cb222cb01b0657
\ No newline at end of file
diff --git a/examples/styling/snapshots/ferra-tiny-skia.sha256 b/examples/styling/snapshots/ferra-tiny-skia.sha256
index 657e0dd8..b88cdad0 100644
--- a/examples/styling/snapshots/ferra-tiny-skia.sha256
+++ b/examples/styling/snapshots/ferra-tiny-skia.sha256
@@ -1 +1 @@
-840c1eff30f6dc63cf3e7f19e2cd0acd31b0b3eb2bf0773000aef5b9a46d9df6
\ No newline at end of file
+19facc84f7170c90a56937be354f65797480751b363e75d35632dd06de81bdbe
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
index 1da1b8c7..1edb8773 100644
--- a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
@@ -1 +1 @@
-7d4c6ae83e8436b1d4e850c82f19e97a911b4ce389a4ba75f8ea722ffc51329a
\ No newline at end of file
+d4c72cf79bad7b58b91973c98499b6e69aa573e0c92528d6da86daff424a1341
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index 98e9dbfd..33ce6df7 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-36ab94c5f69c09ef60feb4524e0a593d2670e345d71139b783796496bdcbceb0
\ No newline at end of file
+3e51e3e29533bc2c8a5546c3d7530cf6c28851efe231c84066282b7f0b83a9d5
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
index cf6fbeac..919be690 100644
--- a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
@@ -1 +1 @@
-262314758d1facbc16b4949c92ba58dd95a10bdf1fe85fa7aa336dcdf536ab85
\ No newline at end of file
+43abf367bca146772d67ba274e49f45c2e2d434eef59f8a4021a4c4f317210c9
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index b0e8b1d5..1cb0fc18 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-fbafd69c60962465f4e0759fc72b3f5bb13895e85821273fff4b51ad1994e7ba
\ No newline at end of file
+323cbd9ab675b6215e5d41a6aea3ca77e1eb603e52e616615424c948042c610d
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
index 9a502d0f..8b04def3 100644
--- a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
@@ -1 +1 @@
-6a237b0387d6621c835521d560b1e56b2c63ca1ebca8256742b0afea3c71725c
\ No newline at end of file
+703da759aee50cd629b888dfa5e393cc84f992c5f1ff57e758dbb7884f09e40c
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index cd41d1b8..b0d1eb4e 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-a1832dfc240eac78bafcdfdbe36fc66b35f984cf67d71adb265fc4f30d383e2b
\ No newline at end of file
+e103068f6f973180a51758ca57508909a303f9d7a21de67373ab9fb69496558c
\ No newline at end of file
diff --git a/examples/styling/snapshots/moonfly-tiny-skia.sha256 b/examples/styling/snapshots/moonfly-tiny-skia.sha256
index f3c9d57d..c58b96e8 100644
--- a/examples/styling/snapshots/moonfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/moonfly-tiny-skia.sha256
@@ -1 +1 @@
-82e617ffb6f5805014377e0b9094b91827de14fa919855d4c6443267291ca677
\ No newline at end of file
+25eddc9e1301afa074e1c6ad892b881b5376ffe4b8f3d69649d41f6d2c5e656b
\ No newline at end of file
diff --git a/examples/styling/snapshots/nightfly-tiny-skia.sha256 b/examples/styling/snapshots/nightfly-tiny-skia.sha256
index 3745dd49..269b268f 100644
--- a/examples/styling/snapshots/nightfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/nightfly-tiny-skia.sha256
@@ -1 +1 @@
-3cae3ed606e1927ef9aaba7e498a54b62ea70d114f0011a048192a2743accbef
\ No newline at end of file
+2902f753890617a6fe2b2cc660ef04966f98c8aa145aefe97244a7641c8a7d0b
\ No newline at end of file
diff --git a/examples/styling/snapshots/nord-tiny-skia.sha256 b/examples/styling/snapshots/nord-tiny-skia.sha256
index 52e996e5..329d222f 100644
--- a/examples/styling/snapshots/nord-tiny-skia.sha256
+++ b/examples/styling/snapshots/nord-tiny-skia.sha256
@@ -1 +1 @@
-8daec0d941ecc2eb52135b63a91936786ef2af48d56fba2d192e00438230ae0b
\ No newline at end of file
+e032a82182b8d1fc83491b375d7139873ac6f8cf113f176344c4c67b61230738
\ No newline at end of file
diff --git a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
index 356e9b0b..9003657e 100644
--- a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
+++ b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
@@ -1 +1 @@
-d0bd8d738130d56857e618efbd9e11b515aa0655e2edf8dc2326b8dabf54c490
\ No newline at end of file
+53527388bc3ffdcfcf14fdf93c293b9bc1dd8adfa54c8aa5d85ef62ccb38803f
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
index f8475616..335fafb3 100644
--- a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
@@ -1 +1 @@
-d1c06a7016554e03308c0a642ea0edf17e397b639aa9194c2314b0e32d8165ff
\ No newline at end of file
+a2a5f4fed4573afc6a0ddc0fe5b9ce7d1edb265f53355c2506238fb3a28fa070
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index 213ee947..f734f58d 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-c8596fa0d72e96e144de58953e7a8ef7c37b88625070642747769af1104a0050
\ No newline at end of file
+4a6ec64d15f05f955b672b68d3c2f39f66c3b6f4762306cea0706905fb0324ed
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
index 4700021e..789941ac 100644
--- a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
@@ -1 +1 @@
-c831821798f5fe38609a7fe854a3785942ae04750ed23936f32b33139126e195
\ No newline at end of file
+3ea751423c27ba0279e34290a3dcfc3f6e11bfb81fbb17d114a5c3048e34d15d
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index a26fd224..a8c562ae 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-26c9d551330f5dbe6680f1c9e8cdf3b6810c26c9de3b22a9a948eae16d5fa3d9
\ No newline at end of file
+4b5a26ee94b1eb231b394e8d853130aea4175725536e93d3c8a3bccb26c24952
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
index 27013156..6a4f0418 100644
--- a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
@@ -1 +1 @@
-5660044597f3ca9e10f5f704cfd4723e7c68f1d211c999063134aa8576227757
\ No newline at end of file
+8e0a90a2c02ed2cd4a471089234f8a5c00c9f994437ea48ab7bc02e055faa83b
\ No newline at end of file

From 53c059bf8811a71a9d293c26ddcc941fa2b29377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 6 Aug 2025 19:37:14 +0200
Subject: [PATCH 40/43] Differentiate `secondary` color from `primary`

---
 core/src/theme/palette.rs                     |  4 +-
 .../catppuccin_frappé-tiny-skia.sha256        |  2 +-
 .../catppuccin_latte-tiny-skia.sha256         |  2 +-
 .../catppuccin_macchiato-tiny-skia.sha256     |  2 +-
 .../catppuccin_mocha-tiny-skia.sha256         |  2 +-
 .../styling/snapshots/dark-tiny-skia.sha256   |  2 +-
 .../snapshots/dracula-tiny-skia.sha256        |  2 +-
 .../styling/snapshots/ferra-tiny-skia.sha256  |  2 +-
 .../snapshots/gruvbox_dark-tiny-skia.sha256   |  2 +-
 .../snapshots/gruvbox_light-tiny-skia.sha256  |  2 +-
 .../kanagawa_dragon-tiny-skia.sha256          |  2 +-
 .../snapshots/kanagawa_lotus-tiny-skia.sha256 |  2 +-
 .../snapshots/kanagawa_wave-tiny-skia.sha256  |  2 +-
 .../styling/snapshots/light-tiny-skia.sha256  |  2 +-
 .../snapshots/moonfly-tiny-skia.sha256        |  2 +-
 .../snapshots/nightfly-tiny-skia.sha256       |  2 +-
 .../styling/snapshots/nord-tiny-skia.sha256   |  2 +-
 .../snapshots/oxocarbon-tiny-skia.sha256      |  2 +-
 .../snapshots/solarized_dark-tiny-skia.sha256 |  2 +-
 .../solarized_light-tiny-skia.sha256          |  2 +-
 .../snapshots/tokyo_night-tiny-skia.sha256    |  2 +-
 .../tokyo_night_light-tiny-skia.sha256        |  2 +-
 .../tokyo_night_storm-tiny-skia.sha256        |  2 +-
 examples/styling/src/main.rs                  | 63 +++++++++++++------
 widget/src/checkbox.rs                        |  2 +-
 widget/src/toggler.rs                         |  2 +-
 26 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index 9b3df4db..86dc61ca 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -530,8 +530,8 @@ impl Secondary {
     /// Generates a set of [`Secondary`] colors from the base and text colors.
     pub fn generate(base: Color, text: Color) -> Self {
         let weak = mix(deviate(base, 0.1), text, 0.2);
-        let base = mix(deviate(base, 0.3), text, 0.3);
-        let strong = mix(deviate(base, 0.5), text, 0.4);
+        let strong = mix(deviate(base, 0.3), text, 0.2);
+        let base = mix(deviate(base, 0.2), text, 0.2);
 
         Self {
             base: Pair::new(base, text),
diff --git a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
index 49055fe7..cdc79b78 100644
--- a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256
@@ -1 +1 @@
-a9dbcf00a56523cb77a48a860337d703e121b3043f918a89a7430b3fe974ed6f
\ No newline at end of file
+0650eb2c27c21c5d48e1e00031a52d8471d8a3b4e827ad502c4628914f5c1c13
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index ed851b89..8eeef16c 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-e949dfd23b9921f042d7878afc0c5919d1e8ddb89f25084c348ca90d3da164f4
\ No newline at end of file
+2c7df7feb07ec72e2e1ec9027764524116e92c75f4ac8701813cc2b006b20bbd
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
index 6f40c0e7..e5900859 100644
--- a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256
@@ -1 +1 @@
-26892d6343cc78505a6964194c2c88f804f2c839672dd445b90ee08f2145fb59
\ No newline at end of file
+8466dc0975c0bc7c06ed3c45df51e99b9d384394f8c3689b15231a872ba1262f
\ No newline at end of file
diff --git a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
index a8091fe2..c20f8b1a 100644
--- a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256
@@ -1 +1 @@
-f07ddc4dae94892e59ae9a5ea557dc45a545b7507aee48b5b6eecec060aa436a
\ No newline at end of file
+1c8f13cfb5d0bbbeb24b80ed35671e8a93d208d79ac4dbd069fe65c4a53c50c2
\ No newline at end of file
diff --git a/examples/styling/snapshots/dark-tiny-skia.sha256 b/examples/styling/snapshots/dark-tiny-skia.sha256
index 4bb1ba65..e5fc3bc2 100644
--- a/examples/styling/snapshots/dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/dark-tiny-skia.sha256
@@ -1 +1 @@
-8954349935620f4f207806ba3e991cab14d38c06212adb9cc60c3d205643277f
\ No newline at end of file
+a1d30652db2cce98b5b86e8e29d776e2fc9091056aff8861cd54fa061161ed47
\ No newline at end of file
diff --git a/examples/styling/snapshots/dracula-tiny-skia.sha256 b/examples/styling/snapshots/dracula-tiny-skia.sha256
index d38944fe..e55502f3 100644
--- a/examples/styling/snapshots/dracula-tiny-skia.sha256
+++ b/examples/styling/snapshots/dracula-tiny-skia.sha256
@@ -1 +1 @@
-c33c96a485bf846250b50c6bc401689a5adcc7414646230622cb222cb01b0657
\ No newline at end of file
+8c01615169803510f1cd4d051721b415adc7147672238aff1275fa3741edb507
\ No newline at end of file
diff --git a/examples/styling/snapshots/ferra-tiny-skia.sha256 b/examples/styling/snapshots/ferra-tiny-skia.sha256
index b88cdad0..611cf302 100644
--- a/examples/styling/snapshots/ferra-tiny-skia.sha256
+++ b/examples/styling/snapshots/ferra-tiny-skia.sha256
@@ -1 +1 @@
-19facc84f7170c90a56937be354f65797480751b363e75d35632dd06de81bdbe
\ No newline at end of file
+0b10823a1d218c145214ff2dcf751584669a3ca1d3e777a2cd618479a809523e
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
index 1edb8773..11614eea 100644
--- a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256
@@ -1 +1 @@
-d4c72cf79bad7b58b91973c98499b6e69aa573e0c92528d6da86daff424a1341
\ No newline at end of file
+26bc668c55650c6c25a14f76feeb1d1f78a96835aaac7a5f57b48b838cb28b14
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index 33ce6df7..42a62bf6 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-3e51e3e29533bc2c8a5546c3d7530cf6c28851efe231c84066282b7f0b83a9d5
\ No newline at end of file
+7536e4551d9d26e66096f9730ae1e4a3c1aae8a9b0a1aa522b310a9d85bf0a09
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
index 919be690..94daa9f4 100644
--- a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256
@@ -1 +1 @@
-43abf367bca146772d67ba274e49f45c2e2d434eef59f8a4021a4c4f317210c9
\ No newline at end of file
+d579b14db1650e907f925302f23c53ebaba370aef6410cfa48fef70ab3138d1f
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index 1cb0fc18..ba657f56 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-323cbd9ab675b6215e5d41a6aea3ca77e1eb603e52e616615424c948042c610d
\ No newline at end of file
+0ebabb128a0d6d0eed9afc7f0546bfc7d591af482c4b652b47f88a43c4a02101
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
index 8b04def3..b7530850 100644
--- a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256
@@ -1 +1 @@
-703da759aee50cd629b888dfa5e393cc84f992c5f1ff57e758dbb7884f09e40c
\ No newline at end of file
+60e1c95159caddb8bd7b8360e32ffd75472be37c4fcbd8ad23dabd0d000a4ec1
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index b0d1eb4e..80546085 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-e103068f6f973180a51758ca57508909a303f9d7a21de67373ab9fb69496558c
\ No newline at end of file
+7399c44d0824fd4959201decd9f901d17607d8368867b04c20530aff556d3373
\ No newline at end of file
diff --git a/examples/styling/snapshots/moonfly-tiny-skia.sha256 b/examples/styling/snapshots/moonfly-tiny-skia.sha256
index c58b96e8..c67427a3 100644
--- a/examples/styling/snapshots/moonfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/moonfly-tiny-skia.sha256
@@ -1 +1 @@
-25eddc9e1301afa074e1c6ad892b881b5376ffe4b8f3d69649d41f6d2c5e656b
\ No newline at end of file
+79ffced2a78689bac1a40ab154a478b4fff87154ee4a8bbf023d922c86b7d53b
\ No newline at end of file
diff --git a/examples/styling/snapshots/nightfly-tiny-skia.sha256 b/examples/styling/snapshots/nightfly-tiny-skia.sha256
index 269b268f..ad8fc9cb 100644
--- a/examples/styling/snapshots/nightfly-tiny-skia.sha256
+++ b/examples/styling/snapshots/nightfly-tiny-skia.sha256
@@ -1 +1 @@
-2902f753890617a6fe2b2cc660ef04966f98c8aa145aefe97244a7641c8a7d0b
\ No newline at end of file
+17c632cbef607502ed2c438f409a1c9bee382d9084c38772021f1f2a4ad3908c
\ No newline at end of file
diff --git a/examples/styling/snapshots/nord-tiny-skia.sha256 b/examples/styling/snapshots/nord-tiny-skia.sha256
index 329d222f..9e373c8e 100644
--- a/examples/styling/snapshots/nord-tiny-skia.sha256
+++ b/examples/styling/snapshots/nord-tiny-skia.sha256
@@ -1 +1 @@
-e032a82182b8d1fc83491b375d7139873ac6f8cf113f176344c4c67b61230738
\ No newline at end of file
+359f7f2c1d7f87e6e0eb80a9a28f70f033d6321ba028d32bc372030b718ed481
\ No newline at end of file
diff --git a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
index 9003657e..b2afc484 100644
--- a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
+++ b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256
@@ -1 +1 @@
-53527388bc3ffdcfcf14fdf93c293b9bc1dd8adfa54c8aa5d85ef62ccb38803f
\ No newline at end of file
+a908d8f154f2baf67455380b5d8b39003c08ba0c80f39e71d4bcd2377bc784fc
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
index 335fafb3..6075ad58 100644
--- a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256
@@ -1 +1 @@
-a2a5f4fed4573afc6a0ddc0fe5b9ce7d1edb265f53355c2506238fb3a28fa070
\ No newline at end of file
+8d6c2bab1f6e9a8db1e2acc8eb76334170e046b709a36dd4ad4d86f8d47346a4
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index f734f58d..dfdd566a 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-4a6ec64d15f05f955b672b68d3c2f39f66c3b6f4762306cea0706905fb0324ed
\ No newline at end of file
+085b968f9c2705d877f238907f2d0afbd890580ea86beae3db8dffda26cd7095
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
index 789941ac..e3bab4b1 100644
--- a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256
@@ -1 +1 @@
-3ea751423c27ba0279e34290a3dcfc3f6e11bfb81fbb17d114a5c3048e34d15d
\ No newline at end of file
+74812d50467787ce39a33ad6bc89411d7b8bc0b13e1bbd45838fcc27c75aee98
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index a8c562ae..28deb8e2 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-4b5a26ee94b1eb231b394e8d853130aea4175725536e93d3c8a3bccb26c24952
\ No newline at end of file
+433fc3c5209201d7fc4eed136566ad1116b1620176cc32c116d1390f45a146af
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
index 6a4f0418..84c3f058 100644
--- a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256
@@ -1 +1 @@
-8e0a90a2c02ed2cd4a471089234f8a5c00c9f994437ea48ab7bc02e055faa83b
\ No newline at end of file
+e1cbe8742f000921c86924056e9a45f95ee2a2a973743bf9f37fee65baccfb9b
\ No newline at end of file
diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs
index 0ba4e20f..f28216f9 100644
--- a/examples/styling/src/main.rs
+++ b/examples/styling/src/main.rs
@@ -4,7 +4,7 @@ use iced::widget::{
     pick_list, progress_bar, row, scrollable, slider, text, text_input,
     toggler, vertical_rule, vertical_space,
 };
-use iced::{Center, Element, Fill, Subscription, Theme};
+use iced::{Center, Element, Fill, Shrink, Subscription, Theme};
 
 pub fn main() -> iced::Result {
     iced::application(Styling::default, Styling::update, Styling::view)
@@ -78,16 +78,37 @@ impl Styling {
             .padding(10)
             .size(20);
 
-        let styled_button = |label| {
-            button(text(label).width(Fill).center())
-                .padding(10)
-                .on_press(Message::ButtonPressed)
-        };
+        let buttons = {
+            let styles = [
+                ("Primary", button::primary as fn(&Theme, _) -> _),
+                ("Secondary", button::secondary),
+                ("Success", button::success),
+                ("Warning", button::warning),
+                ("Danger", button::danger),
+            ];
 
-        let primary = styled_button("Primary");
-        let success = styled_button("Success").style(button::success);
-        let warning = styled_button("Warning").style(button::warning);
-        let danger = styled_button("Danger").style(button::danger);
+            let styled_button =
+                |label| button(text(label).width(Fill).center()).padding(10);
+
+            column![
+                row(styles.into_iter().map(|(name, style)| styled_button(
+                    name
+                )
+                .on_press(Message::ButtonPressed)
+                .style(style)
+                .into()))
+                .spacing(10)
+                .align_y(Center),
+                row(styles.into_iter().map(|(name, style)| styled_button(
+                    name
+                )
+                .style(style)
+                .into()))
+                .spacing(10)
+                .align_y(Center),
+            ]
+            .spacing(10)
+        };
 
         let slider =
             || slider(0.0..=100.0, self.slider_value, Message::SliderChanged);
@@ -100,16 +121,21 @@ impl Styling {
             "You did it!"
         ])
         .width(Fill)
-        .height(100);
+        .height(Fill);
 
-        let checkbox = checkbox("Check me!", self.checkbox_value)
+        let check = checkbox("Check me!", self.checkbox_value)
             .on_toggle(Message::CheckboxToggled);
 
-        let toggler = toggler(self.toggler_value)
+        let check_disabled = checkbox("Disabled", self.checkbox_value);
+
+        let toggle = toggler(self.toggler_value)
             .label("Toggle me!")
             .on_toggle(Message::TogglerToggled)
             .spacing(10);
 
+        let disabled_toggle =
+            toggler(self.toggler_value).label("Disabled").spacing(10);
+
         let card = {
             container(
                 column![
@@ -128,18 +154,17 @@ impl Styling {
             choose_theme,
             horizontal_rule(1),
             text_input,
-            row![primary, success, warning, danger]
-                .spacing(10)
-                .align_y(Center),
+            buttons,
             slider(),
             progress_bar(),
             row![
                 scroll_me,
-                row![vertical_rule(1), column![checkbox, toggler].spacing(20)]
-                    .spacing(20)
+                vertical_rule(1),
+                column![check, check_disabled, toggle, disabled_toggle]
+                    .spacing(10)
             ]
             .spacing(10)
-            .height(100)
+            .height(Shrink)
             .align_y(Center),
             card
         ]
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 91c87ac0..04e7472e 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -571,7 +571,7 @@ pub fn primary(theme: &Theme, status: Status) -> Style {
         ),
         Status::Disabled { is_checked } => styled(
             palette.background.weak.color,
-            palette.background.weak,
+            palette.background.weaker,
             palette.primary.base.text,
             palette.background.strong,
             is_checked,
diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
index 41e4bd64..13385317 100644
--- a/widget/src/toggler.rs
+++ b/widget/src/toggler.rs
@@ -580,7 +580,7 @@ pub fn default(theme: &Theme, status: Status) -> Style {
                 palette.background.weak.color
             }
         }
-        Status::Disabled => palette.background.base.color,
+        Status::Disabled => palette.background.weakest.color,
     };
 
     Style {

From f350db7c8c54cf9e0f11862f0a7518b57557bb84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Wed, 6 Aug 2025 20:19:03 +0200
Subject: [PATCH 41/43] Bump contrast of `secondary` color in light themes

---
 core/src/theme/palette.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/theme/palette.rs b/core/src/theme/palette.rs
index 86dc61ca..88c843b0 100644
--- a/core/src/theme/palette.rs
+++ b/core/src/theme/palette.rs
@@ -529,9 +529,11 @@ pub struct Secondary {
 impl Secondary {
     /// Generates a set of [`Secondary`] colors from the base and text colors.
     pub fn generate(base: Color, text: Color) -> Self {
-        let weak = mix(deviate(base, 0.1), text, 0.2);
-        let strong = mix(deviate(base, 0.3), text, 0.2);
-        let base = mix(deviate(base, 0.2), text, 0.2);
+        let factor = if is_dark(base) { 0.2 } else { 0.4 };
+
+        let weak = mix(deviate(base, 0.1), text, factor);
+        let strong = mix(deviate(base, 0.3), text, factor);
+        let base = mix(deviate(base, 0.2), text, factor);
 
         Self {
             base: Pair::new(base, text),

From 88185f9d97d6f11a59e6550473b5b24d93b38fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Thu, 7 Aug 2025 04:24:38 +0200
Subject: [PATCH 42/43] Regenerate `styling` snapshots (one last time)

---
 examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256  | 2 +-
 examples/styling/snapshots/gruvbox_light-tiny-skia.sha256     | 2 +-
 examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256    | 2 +-
 examples/styling/snapshots/light-tiny-skia.sha256             | 2 +-
 examples/styling/snapshots/solarized_light-tiny-skia.sha256   | 2 +-
 examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
index 8eeef16c..f7b72157 100644
--- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
+++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256
@@ -1 +1 @@
-2c7df7feb07ec72e2e1ec9027764524116e92c75f4ac8701813cc2b006b20bbd
\ No newline at end of file
+ae1da92064373838152ac163072ee68135f530e0fef8146a01aea1df5cfdb494
\ No newline at end of file
diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
index 42a62bf6..a4ed62b2 100644
--- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256
@@ -1 +1 @@
-7536e4551d9d26e66096f9730ae1e4a3c1aae8a9b0a1aa522b310a9d85bf0a09
\ No newline at end of file
+228eb8d64eed2f3726d27490b88a4519e36979a0ccfb0db8e164c5e5296b0739
\ No newline at end of file
diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
index ba657f56..34f7aa20 100644
--- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
+++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256
@@ -1 +1 @@
-0ebabb128a0d6d0eed9afc7f0546bfc7d591af482c4b652b47f88a43c4a02101
\ No newline at end of file
+ab8f9190260837ba9b0cf30f072116e86be1c90197a56ad00da6de60a618a3b8
\ No newline at end of file
diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256
index 80546085..aea0e467 100644
--- a/examples/styling/snapshots/light-tiny-skia.sha256
+++ b/examples/styling/snapshots/light-tiny-skia.sha256
@@ -1 +1 @@
-7399c44d0824fd4959201decd9f901d17607d8368867b04c20530aff556d3373
\ No newline at end of file
+2e3c4ea86b5bd968b8ec77a7ec7b5b7ae29d5ee8e4b68a216c1fa11d92c015bc
\ No newline at end of file
diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
index dfdd566a..89ccf263 100644
--- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256
@@ -1 +1 @@
-085b968f9c2705d877f238907f2d0afbd890580ea86beae3db8dffda26cd7095
\ No newline at end of file
+ddee619e66418803c64ed5677fd375ad596e234ab9541ab197f17c81e2100279
\ No newline at end of file
diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
index 28deb8e2..d533a94c 100644
--- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
+++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256
@@ -1 +1 @@
-433fc3c5209201d7fc4eed136566ad1116b1620176cc32c116d1390f45a146af
\ No newline at end of file
+b04218ee65cd446b142596a2cd9ff69d5267969af86026a4ff394f3c13a4d842
\ No newline at end of file

From d5cd0a6de9d0e0030bd5fd7e5347cd91e6a652f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Thu, 7 Aug 2025 22:36:02 +0200
Subject: [PATCH 43/43] Fix lints for Rust 1.89 and bump MSRV to `1.88`

---
 .github/workflows/test.yml                    |   4 +-
 Cargo.toml                                    |   2 +-
 examples/editor/src/main.rs                   |   8 +-
 examples/pane_grid/src/main.rs                |  23 +-
 .../creates_a_new_task-tiny-skia.sha256       |   2 +-
 .../snapshots/creates_a_new_task-wgpu.sha256  |   1 -
 examples/websocket/src/main.rs                |  10 +-
 graphics/src/text/editor.rs                   |  18 +-
 wgpu/src/image/raster.rs                      |   6 +-
 widget/src/checkbox.rs                        |   8 +-
 widget/src/combo_box.rs                       |  60 ++--
 widget/src/mouse_area.rs                      |  32 +--
 widget/src/overlay/menu.rs                    |  40 ++-
 widget/src/pane_grid.rs                       | 269 +++++++++---------
 widget/src/pane_grid/state.rs                 |  25 +-
 widget/src/pane_grid/title_bar.rs             |  60 ++--
 widget/src/scrollable.rs                      |  42 ++-
 widget/src/table.rs                           |   8 +-
 widget/src/text_editor.rs                     |  26 +-
 widget/src/text_input.rs                      |  55 ++--
 winit/src/lib.rs                              |  56 ++--
 21 files changed, 360 insertions(+), 395 deletions(-)
 delete mode 100644 examples/todos/snapshots/creates_a_new_task-wgpu.sha256

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1e988195..d24f4503 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        rust: [stable, beta, "1.85"]
+        rust: [stable, beta, "1.88"]
     steps:
     - uses: hecrj/setup-rust-action@v2
       with:
@@ -23,5 +23,7 @@ jobs:
         sudo apt-get install -y libxkbcommon-dev libgtk-3-dev
     - name: Run tests
       run: |
+        cargo test --verbose --workspace
         cargo test --verbose --workspace -- --ignored
+        cargo test --verbose --workspace --all-features
         cargo test --verbose --workspace --all-features -- --ignored
diff --git a/Cargo.toml b/Cargo.toml
index 6fed9896..be4070ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -145,7 +145,7 @@ repository = "https://github.com/iced-rs/iced"
 homepage = "https://iced.rs"
 categories = ["gui"]
 keywords = ["gui", "ui", "graphics", "interface", "widgets"]
-rust-version = "1.85"
+rust-version = "1.88"
 
 [workspace.dependencies]
 iced = { version = "0.14.0-dev", path = "." }
diff --git a/examples/editor/src/main.rs b/examples/editor/src/main.rs
index abad1abe..ad2337d8 100644
--- a/examples/editor/src/main.rs
+++ b/examples/editor/src/main.rs
@@ -119,10 +119,10 @@ impl Editor {
 
                     let mut text = self.content.text();
 
-                    if let Some(ending) = self.content.line_ending() {
-                        if !text.ends_with(ending.as_str()) {
-                            text.push_str(ending.as_str());
-                        }
+                    if let Some(ending) = self.content.line_ending()
+                        && !text.ends_with(ending.as_str())
+                    {
+                        text.push_str(ending.as_str());
                     }
 
                     Task::perform(
diff --git a/examples/pane_grid/src/main.rs b/examples/pane_grid/src/main.rs
index 2d2b92d9..f94e83ca 100644
--- a/examples/pane_grid/src/main.rs
+++ b/examples/pane_grid/src/main.rs
@@ -71,11 +71,10 @@ impl Example {
                 }
             }
             Message::FocusAdjacent(direction) => {
-                if let Some(pane) = self.focus {
-                    if let Some(adjacent) = self.panes.adjacent(pane, direction)
-                    {
-                        self.focus = Some(adjacent);
-                    }
+                if let Some(pane) = self.focus
+                    && let Some(adjacent) = self.panes.adjacent(pane, direction)
+                {
+                    self.focus = Some(adjacent);
                 }
             }
             Message::Clicked(pane) => {
@@ -106,14 +105,12 @@ impl Example {
                 }
             }
             Message::CloseFocused => {
-                if let Some(pane) = self.focus {
-                    if let Some(Pane { is_pinned, .. }) = self.panes.get(pane) {
-                        if !is_pinned {
-                            if let Some((_, sibling)) = self.panes.close(pane) {
-                                self.focus = Some(sibling);
-                            }
-                        }
-                    }
+                if let Some(pane) = self.focus
+                    && let Some(Pane { is_pinned, .. }) = self.panes.get(pane)
+                    && !is_pinned
+                    && let Some((_, sibling)) = self.panes.close(pane)
+                {
+                    self.focus = Some(sibling);
                 }
             }
         }
diff --git a/examples/todos/snapshots/creates_a_new_task-tiny-skia.sha256 b/examples/todos/snapshots/creates_a_new_task-tiny-skia.sha256
index f62b2f69..e6746cf8 100644
--- a/examples/todos/snapshots/creates_a_new_task-tiny-skia.sha256
+++ b/examples/todos/snapshots/creates_a_new_task-tiny-skia.sha256
@@ -1 +1 @@
-0e355b080ad33905145e9f70a3b29e2481197c8fc8f42491acd5358238ebbd5f
\ No newline at end of file
+99f418007af163f172e163565f166da31015521e1bf7de95fa55cda2fb5a7db5
\ No newline at end of file
diff --git a/examples/todos/snapshots/creates_a_new_task-wgpu.sha256 b/examples/todos/snapshots/creates_a_new_task-wgpu.sha256
deleted file mode 100644
index 6dd6ccbe..00000000
--- a/examples/todos/snapshots/creates_a_new_task-wgpu.sha256
+++ /dev/null
@@ -1 +0,0 @@
-804a1bb6d49e3b3158463202960447d9e7820b967280f41dd0c34c00d3edf2c3
\ No newline at end of file
diff --git a/examples/websocket/src/main.rs b/examples/websocket/src/main.rs
index 95f06fa4..1c034ee4 100644
--- a/examples/websocket/src/main.rs
+++ b/examples/websocket/src/main.rs
@@ -116,11 +116,11 @@ impl WebSocket {
             let mut button = button(text("Send").height(40).align_y(Center))
                 .padding([0, 20]);
 
-            if matches!(self.state, State::Connected(_)) {
-                if let Some(message) = echo::Message::new(&self.new_message) {
-                    input = input.on_submit(Message::Send(message.clone()));
-                    button = button.on_press(Message::Send(message));
-                }
+            if matches!(self.state, State::Connected(_))
+                && let Some(message) = echo::Message::new(&self.new_message)
+            {
+                input = input.on_submit(Message::Send(message.clone()));
+                button = button.on_press(Message::Send(message));
             }
 
             row![input, button].spacing(10).align_y(Center)
diff --git a/graphics/src/text/editor.rs b/graphics/src/text/editor.rs
index 4afd7b12..72a6fc68 100644
--- a/graphics/src/text/editor.rs
+++ b/graphics/src/text/editor.rs
@@ -321,10 +321,11 @@ impl editor::Editor for Editor {
                 );
 
                 // Deselect if selection matches cursor position
-                if let Some((start, end)) = editor.selection_bounds() {
-                    if start.line == end.line && start.index == end.index {
-                        editor.set_selection(cosmic_text::Selection::None);
-                    }
+                if let Some((start, end)) = editor.selection_bounds()
+                    && start.line == end.line
+                    && start.index == end.index
+                {
+                    editor.set_selection(cosmic_text::Selection::None);
                 }
             }
             Action::SelectWord => {
@@ -438,10 +439,11 @@ impl editor::Editor for Editor {
                 );
 
                 // Deselect if selection matches cursor position
-                if let Some((start, end)) = editor.selection_bounds() {
-                    if start.line == end.line && start.index == end.index {
-                        editor.set_selection(cosmic_text::Selection::None);
-                    }
+                if let Some((start, end)) = editor.selection_bounds()
+                    && start.line == end.line
+                    && start.index == end.index
+                {
+                    editor.set_selection(cosmic_text::Selection::None);
                 }
             }
             Action::Scroll { lines } => {
diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs
index 83777807..470c39e2 100644
--- a/wgpu/src/image/raster.rs
+++ b/wgpu/src/image/raster.rs
@@ -99,10 +99,8 @@ impl Cache {
         self.map.retain(|k, memory| {
             let retain = hits.contains(k);
 
-            if !retain {
-                if let Memory::Device(entry) = memory {
-                    atlas.remove(entry);
-                }
+            if !retain && let Memory::Device(entry) = memory {
+                atlas.remove(entry);
             }
 
             retain
diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index 04e7472e..42ef89fd 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -320,11 +320,9 @@ where
             | Event::Touch(touch::Event::FingerPressed { .. }) => {
                 let mouse_over = cursor.is_over(layout.bounds());
 
-                if mouse_over {
-                    if let Some(on_toggle) = &self.on_toggle {
-                        shell.publish((on_toggle)(!self.is_checked));
-                        shell.capture_event();
-                    }
+                if mouse_over && let Some(on_toggle) = &self.on_toggle {
+                    shell.publish((on_toggle)(!self.is_checked));
+                    shell.capture_event();
                 }
             }
             _ => {}
diff --git a/widget/src/combo_box.rs b/widget/src/combo_box.rs
index 5bf01eac..581a4fcd 100644
--- a/widget/src/combo_box.rs
+++ b/widget/src/combo_box.rs
@@ -599,17 +599,16 @@ where
 
         if is_focused {
             self.state.with_inner(|state| {
-                if !started_focused {
-                    if let Some(on_option_hovered) = &mut self.on_option_hovered
-                    {
-                        let hovered_option = menu.hovered_option.unwrap_or(0);
+                if !started_focused
+                    && let Some(on_option_hovered) = &mut self.on_option_hovered
+                {
+                    let hovered_option = menu.hovered_option.unwrap_or(0);
 
-                        if let Some(option) =
-                            state.filtered_options.options.get(hovered_option)
-                        {
-                            shell.publish(on_option_hovered(option.clone()));
-                            published_message_to_shell = true;
-                        }
+                    if let Some(option) =
+                        state.filtered_options.options.get(hovered_option)
+                    {
+                        shell.publish(on_option_hovered(option.clone()));
+                        published_message_to_shell = true;
                     }
                 }
 
@@ -622,12 +621,11 @@ where
                     let shift_modifier = modifiers.shift();
                     match (named_key, shift_modifier) {
                         (key::Named::Enter, _) => {
-                            if let Some(index) = &menu.hovered_option {
-                                if let Some(option) =
+                            if let Some(index) = &menu.hovered_option
+                                && let Some(option) =
                                     state.filtered_options.options.get(*index)
-                                {
-                                    menu.new_selection = Some(option.clone());
-                                }
+                            {
+                                menu.new_selection = Some(option.clone());
                             }
 
                             shell.capture_event();
@@ -650,21 +648,19 @@ where
 
                             if let Some(on_option_hovered) =
                                 &mut self.on_option_hovered
-                            {
-                                if let Some(option) =
+                                && let Some(option) =
                                     menu.hovered_option.and_then(|index| {
                                         state
                                             .filtered_options
                                             .options
                                             .get(index)
                                     })
-                                {
-                                    // Notify the selection
-                                    shell.publish((on_option_hovered)(
-                                        option.clone(),
-                                    ));
-                                    published_message_to_shell = true;
-                                }
+                            {
+                                // Notify the selection
+                                shell.publish((on_option_hovered)(
+                                    option.clone(),
+                                ));
+                                published_message_to_shell = true;
                             }
 
                             shell.capture_event();
@@ -698,21 +694,19 @@ where
 
                             if let Some(on_option_hovered) =
                                 &mut self.on_option_hovered
-                            {
-                                if let Some(option) =
+                                && let Some(option) =
                                     menu.hovered_option.and_then(|index| {
                                         state
                                             .filtered_options
                                             .options
                                             .get(index)
                                     })
-                                {
-                                    // Notify the selection
-                                    shell.publish((on_option_hovered)(
-                                        option.clone(),
-                                    ));
-                                    published_message_to_shell = true;
-                                }
+                            {
+                                // Notify the selection
+                                shell.publish((on_option_hovered)(
+                                    option.clone(),
+                                ));
+                                published_message_to_shell = true;
                             }
 
                             shell.capture_event();
diff --git a/widget/src/mouse_area.rs b/widget/src/mouse_area.rs
index e17ccd97..fefa68d5 100644
--- a/widget/src/mouse_area.rs
+++ b/widget/src/mouse_area.rs
@@ -377,24 +377,24 @@ fn update<Message: Clone, Theme, Renderer>(
                 shell.capture_event();
             }
 
-            if let Some(position) = cursor_position {
-                if let Some(message) = widget.on_double_click.as_ref() {
-                    let new_click = mouse::Click::new(
-                        position,
-                        mouse::Button::Left,
-                        state.previous_click,
-                    );
+            if let Some(position) = cursor_position
+                && let Some(message) = widget.on_double_click.as_ref()
+            {
+                let new_click = mouse::Click::new(
+                    position,
+                    mouse::Button::Left,
+                    state.previous_click,
+                );
 
-                    if new_click.kind() == mouse::click::Kind::Double {
-                        shell.publish(message.clone());
-                    }
-
-                    state.previous_click = Some(new_click);
-
-                    // Even if this is not a double click, but the press is nevertheless
-                    // processed by us and should not be popup to parent widgets.
-                    shell.capture_event();
+                if new_click.kind() == mouse::click::Kind::Double {
+                    shell.publish(message.clone());
                 }
+
+                state.previous_click = Some(new_click);
+
+                // Even if this is not a double click, but the press is nevertheless
+                // processed by us and should not be popup to parent widgets.
+                shell.capture_event();
             }
         }
         Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs
index 7778768a..741dbf15 100644
--- a/widget/src/overlay/menu.rs
+++ b/widget/src/overlay/menu.rs
@@ -407,13 +407,12 @@ where
     ) {
         match event {
             Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
-                if cursor.is_over(layout.bounds()) {
-                    if let Some(index) = *self.hovered_option {
-                        if let Some(option) = self.options.get(index) {
-                            shell.publish((self.on_selected)(option.clone()));
-                            shell.capture_event();
-                        }
-                    }
+                if cursor.is_over(layout.bounds())
+                    && let Some(index) = *self.hovered_option
+                    && let Some(option) = self.options.get(index)
+                {
+                    shell.publish((self.on_selected)(option.clone()));
+                    shell.capture_event();
                 }
             }
             Event::Mouse(mouse::Event::CursorMoved { .. }) => {
@@ -431,19 +430,16 @@ where
                     let new_hovered_option =
                         (cursor_position.y / option_height) as usize;
 
-                    if *self.hovered_option != Some(new_hovered_option) {
-                        if let Some(option) =
+                    if *self.hovered_option != Some(new_hovered_option)
+                        && let Some(option) =
                             self.options.get(new_hovered_option)
+                    {
+                        if let Some(on_option_hovered) = self.on_option_hovered
                         {
-                            if let Some(on_option_hovered) =
-                                self.on_option_hovered
-                            {
-                                shell
-                                    .publish(on_option_hovered(option.clone()));
-                            }
-
-                            shell.request_redraw();
+                            shell.publish(on_option_hovered(option.clone()));
                         }
+
+                        shell.request_redraw();
                     }
 
                     *self.hovered_option = Some(new_hovered_option);
@@ -464,11 +460,11 @@ where
                     *self.hovered_option =
                         Some((cursor_position.y / option_height) as usize);
 
-                    if let Some(index) = *self.hovered_option {
-                        if let Some(option) = self.options.get(index) {
-                            shell.publish((self.on_selected)(option.clone()));
-                            shell.capture_event();
-                        }
+                    if let Some(index) = *self.hovered_option
+                        && let Some(option) = self.options.get(index)
+                    {
+                        shell.publish((self.on_selected)(option.clone()));
+                        shell.capture_event();
                     }
                 }
             }
diff --git a/widget/src/pane_grid.rs b/widget/src/pane_grid.rs
index db60fabc..158c265b 100644
--- a/widget/src/pane_grid.rs
+++ b/widget/src/pane_grid.rs
@@ -593,56 +593,47 @@ where
             Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
             | Event::Touch(touch::Event::FingerLifted { .. })
             | Event::Touch(touch::Event::FingerLost { .. }) => {
-                if let Some((pane, origin)) = action.picked_pane() {
-                    if let Some(on_drag) = on_drag {
-                        if let Some(cursor_position) = cursor.position() {
-                            if cursor_position.distance(origin)
-                                > DRAG_DEADBAND_DISTANCE
-                            {
-                                let event = if let Some(edge) =
-                                    in_edge(layout, cursor_position)
+                if let Some((pane, origin)) = action.picked_pane()
+                    && let Some(on_drag) = on_drag
+                    && let Some(cursor_position) = cursor.position()
+                {
+                    if cursor_position.distance(origin) > DRAG_DEADBAND_DISTANCE
+                    {
+                        let event = if let Some(edge) =
+                            in_edge(layout, cursor_position)
+                        {
+                            DragEvent::Dropped {
+                                pane,
+                                target: Target::Edge(edge),
+                            }
+                        } else {
+                            let dropped_region = self
+                                .panes
+                                .iter()
+                                .copied()
+                                .zip(&self.contents)
+                                .zip(layout.children())
+                                .find_map(|(target, layout)| {
+                                    layout_region(layout, cursor_position)
+                                        .map(|region| (target, region))
+                                });
+
+                            match dropped_region {
+                                Some(((target, _), region))
+                                    if pane != target =>
                                 {
                                     DragEvent::Dropped {
                                         pane,
-                                        target: Target::Edge(edge),
+                                        target: Target::Pane(target, region),
                                     }
-                                } else {
-                                    let dropped_region = self
-                                        .panes
-                                        .iter()
-                                        .copied()
-                                        .zip(&self.contents)
-                                        .zip(layout.children())
-                                        .find_map(|(target, layout)| {
-                                            layout_region(
-                                                layout,
-                                                cursor_position,
-                                            )
-                                            .map(|region| (target, region))
-                                        });
-
-                                    match dropped_region {
-                                        Some(((target, _), region))
-                                            if pane != target =>
-                                        {
-                                            DragEvent::Dropped {
-                                                pane,
-                                                target: Target::Pane(
-                                                    target, region,
-                                                ),
-                                            }
-                                        }
-                                        _ => DragEvent::Canceled { pane },
-                                    }
-                                };
-
-                                shell.publish(on_drag(event));
-                            } else {
-                                shell.publish(on_drag(DragEvent::Canceled {
-                                    pane,
-                                }));
+                                }
+                                _ => DragEvent::Canceled { pane },
                             }
-                        }
+                        };
+
+                        shell.publish(on_drag(event));
+                    } else {
+                        shell.publish(on_drag(DragEvent::Canceled { pane }));
                     }
                 }
 
@@ -660,34 +651,33 @@ where
                             bounds.size(),
                         );
 
-                        if let Some((axis, rectangle, _)) = splits.get(&split) {
-                            if let Some(cursor_position) = cursor.position() {
-                                let ratio = match axis {
-                                    Axis::Horizontal => {
-                                        let position = cursor_position.y
-                                            - bounds.y
-                                            - rectangle.y;
+                        if let Some((axis, rectangle, _)) = splits.get(&split)
+                            && let Some(cursor_position) = cursor.position()
+                        {
+                            let ratio = match axis {
+                                Axis::Horizontal => {
+                                    let position = cursor_position.y
+                                        - bounds.y
+                                        - rectangle.y;
 
-                                        (position / rectangle.height)
-                                            .clamp(0.0, 1.0)
-                                    }
-                                    Axis::Vertical => {
-                                        let position = cursor_position.x
-                                            - bounds.x
-                                            - rectangle.x;
+                                    (position / rectangle.height)
+                                        .clamp(0.0, 1.0)
+                                }
+                                Axis::Vertical => {
+                                    let position = cursor_position.x
+                                        - bounds.x
+                                        - rectangle.x;
 
-                                        (position / rectangle.width)
-                                            .clamp(0.0, 1.0)
-                                    }
-                                };
+                                    (position / rectangle.width).clamp(0.0, 1.0)
+                                }
+                            };
 
-                                shell.publish(on_resize(ResizeEvent {
-                                    split,
-                                    ratio,
-                                }));
+                            shell.publish(on_resize(ResizeEvent {
+                                split,
+                                ratio,
+                            }));
 
-                                shell.capture_event();
-                            }
+                            shell.capture_event();
                         }
                     } else if action.picked_pane().is_some() {
                         shell.request_redraw();
@@ -889,24 +879,23 @@ where
                         viewport,
                     );
 
-                    if picked_pane.is_some() && pane_in_edge.is_none() {
-                        if let Some(region) =
+                    if picked_pane.is_some()
+                        && pane_in_edge.is_none()
+                        && let Some(region) =
                             cursor.position().and_then(|cursor_position| {
                                 layout_region(pane_layout, cursor_position)
                             })
-                        {
-                            let bounds =
-                                layout_region_bounds(pane_layout, region);
+                    {
+                        let bounds = layout_region_bounds(pane_layout, region);
 
-                            renderer.fill_quad(
-                                renderer::Quad {
-                                    bounds,
-                                    border: style.hovered_region.border,
-                                    ..renderer::Quad::default()
-                                },
-                                style.hovered_region.background,
-                            );
-                        }
+                        renderer.fill_quad(
+                            renderer::Quad {
+                                bounds,
+                                border: style.hovered_region.border,
+                                ..renderer::Quad::default()
+                            },
+                            style.hovered_region.background,
+                        );
                     }
                 }
                 _ => {
@@ -937,64 +926,62 @@ where
         }
 
         // Render picked pane last
-        if let Some(((content, tree), origin, layout)) = render_picked_pane {
-            if let Some(cursor_position) = cursor.position() {
-                let bounds = layout.bounds();
+        if let Some(((content, tree), origin, layout)) = render_picked_pane
+            && let Some(cursor_position) = cursor.position()
+        {
+            let bounds = layout.bounds();
 
-                let translation =
-                    cursor_position - Point::new(origin.x, origin.y);
+            let translation = cursor_position - Point::new(origin.x, origin.y);
 
-                renderer.with_translation(translation, |renderer| {
-                    renderer.with_layer(bounds, |renderer| {
-                        content.draw(
-                            tree,
-                            renderer,
-                            theme,
-                            defaults,
-                            layout,
-                            pane_cursor,
-                            viewport,
-                        );
-                    });
+            renderer.with_translation(translation, |renderer| {
+                renderer.with_layer(bounds, |renderer| {
+                    content.draw(
+                        tree,
+                        renderer,
+                        theme,
+                        defaults,
+                        layout,
+                        pane_cursor,
+                        viewport,
+                    );
                 });
-            }
+            });
         }
 
-        if picked_pane.is_none() {
-            if let Some((axis, split_region, is_picked)) = picked_split {
-                let highlight = if is_picked {
-                    style.picked_split
-                } else {
-                    style.hovered_split
-                };
+        if picked_pane.is_none()
+            && let Some((axis, split_region, is_picked)) = picked_split
+        {
+            let highlight = if is_picked {
+                style.picked_split
+            } else {
+                style.hovered_split
+            };
 
-                renderer.fill_quad(
-                    renderer::Quad {
-                        bounds: match axis {
-                            Axis::Horizontal => Rectangle {
-                                x: split_region.x,
-                                y: (split_region.y
-                                    + (split_region.height - highlight.width)
-                                        / 2.0)
-                                    .round(),
-                                width: split_region.width,
-                                height: highlight.width,
-                            },
-                            Axis::Vertical => Rectangle {
-                                x: (split_region.x
-                                    + (split_region.width - highlight.width)
-                                        / 2.0)
-                                    .round(),
-                                y: split_region.y,
-                                width: highlight.width,
-                                height: split_region.height,
-                            },
+            renderer.fill_quad(
+                renderer::Quad {
+                    bounds: match axis {
+                        Axis::Horizontal => Rectangle {
+                            x: split_region.x,
+                            y: (split_region.y
+                                + (split_region.height - highlight.width)
+                                    / 2.0)
+                                .round(),
+                            width: split_region.width,
+                            height: highlight.width,
+                        },
+                        Axis::Vertical => Rectangle {
+                            x: (split_region.x
+                                + (split_region.width - highlight.width) / 2.0)
+                                .round(),
+                            y: split_region.y,
+                            width: highlight.width,
+                            height: split_region.height,
                         },
-                        ..renderer::Quad::default()
                     },
-                    highlight.color,
-                );
-            }
+                    ..renderer::Quad::default()
+                },
+                highlight.color,
+            );
         }
     }
 
@@ -1086,15 +1073,15 @@ fn click_pane<'a, Message, T>(
             shell.publish(on_click(pane));
         }
 
-        if let Some(on_drag) = &on_drag {
-            if content.can_be_dragged_at(layout, cursor_position) {
-                *action = state::Action::Dragging {
-                    pane,
-                    origin: cursor_position,
-                };
+        if let Some(on_drag) = &on_drag
+            && content.can_be_dragged_at(layout, cursor_position)
+        {
+            *action = state::Action::Dragging {
+                pane,
+                origin: cursor_position,
+            };
 
-                shell.publish(on_drag(DragEvent::Picked { pane }));
-            }
+            shell.publish(on_drag(DragEvent::Picked { pane }));
         }
     }
 }
diff --git a/widget/src/pane_grid/state.rs b/widget/src/pane_grid/state.rs
index d999434f..84c971bf 100644
--- a/widget/src/pane_grid/state.rs
+++ b/widget/src/pane_grid/state.rs
@@ -219,14 +219,14 @@ impl<T> State<T> {
         pane: Pane,
         swap: bool,
     ) {
-        if let Some((state, _)) = self.close(pane) {
-            if let Some((new_pane, _)) = self.split(axis, target, state) {
-                // Ensure new node corresponds to original closed `Pane` for state continuity
-                self.relabel(new_pane, pane);
+        if let Some((state, _)) = self.close(pane)
+            && let Some((new_pane, _)) = self.split(axis, target, state)
+        {
+            // Ensure new node corresponds to original closed `Pane` for state continuity
+            self.relabel(new_pane, pane);
 
-                if swap {
-                    self.swap(target, pane);
-                }
+            if swap {
+                self.swap(target, pane);
             }
         }
     }
@@ -257,13 +257,12 @@ impl<T> State<T> {
         pane: Pane,
         inverse: bool,
     ) {
-        if let Some((state, _)) = self.close(pane) {
-            if let Some((new_pane, _)) =
+        if let Some((state, _)) = self.close(pane)
+            && let Some((new_pane, _)) =
                 self.split_node(axis, None, state, inverse)
-            {
-                // Ensure new node corresponds to original closed `Pane` for state continuity
-                self.relabel(new_pane, pane);
-            }
+        {
+            // Ensure new node corresponds to original closed `Pane` for state continuity
+            self.relabel(new_pane, pane);
         }
     }
 
diff --git a/widget/src/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs
index 5cd53b50..e47f4a10 100644
--- a/widget/src/pane_grid/title_bar.rs
+++ b/widget/src/pane_grid/title_bar.rs
@@ -174,38 +174,28 @@ where
         let title_layout = children.next().unwrap();
         let mut show_title = true;
 
-        if let Some(controls) = &self.controls {
-            if show_controls || self.always_show_controls {
-                let controls_layout = children.next().unwrap();
-                if title_layout.bounds().width + controls_layout.bounds().width
-                    > padded.bounds().width
-                {
-                    if let Some(compact) = controls.compact.as_ref() {
-                        let compact_layout = children.next().unwrap();
+        if let Some(controls) = &self.controls
+            && (show_controls || self.always_show_controls)
+        {
+            let controls_layout = children.next().unwrap();
+            if title_layout.bounds().width + controls_layout.bounds().width
+                > padded.bounds().width
+            {
+                if let Some(compact) = controls.compact.as_ref() {
+                    let compact_layout = children.next().unwrap();
 
-                        compact.as_widget().draw(
-                            &tree.children[2],
-                            renderer,
-                            theme,
-                            &inherited_style,
-                            compact_layout,
-                            cursor,
-                            viewport,
-                        );
-                    } else {
-                        show_title = false;
-
-                        controls.full.as_widget().draw(
-                            &tree.children[1],
-                            renderer,
-                            theme,
-                            &inherited_style,
-                            controls_layout,
-                            cursor,
-                            viewport,
-                        );
-                    }
+                    compact.as_widget().draw(
+                        &tree.children[2],
+                        renderer,
+                        theme,
+                        &inherited_style,
+                        compact_layout,
+                        cursor,
+                        viewport,
+                    );
                 } else {
+                    show_title = false;
+
                     controls.full.as_widget().draw(
                         &tree.children[1],
                         renderer,
@@ -216,6 +206,16 @@ where
                         viewport,
                     );
                 }
+            } else {
+                controls.full.as_widget().draw(
+                    &tree.children[1],
+                    renderer,
+                    theme,
+                    &inherited_style,
+                    controls_layout,
+                    cursor,
+                    viewport,
+                );
             }
         }
 
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 61e78d50..baff578e 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -798,12 +798,11 @@ where
                     },
                 );
 
-                if !had_input_method {
-                    if let InputMethod::Enabled { position, .. } =
+                if !had_input_method
+                    && let InputMethod::Enabled { position, .. } =
                         shell.input_method_mut()
-                    {
-                        *position = *position - translation;
-                    }
+                {
+                    *position = *position - translation;
                 }
             };
 
@@ -1091,23 +1090,22 @@ where
                         );
                     }
 
-                    if let Some(scroller) = scrollbar.scroller {
-                        if scroller.bounds.width > 0.0
-                            && scroller.bounds.height > 0.0
-                            && (style.scroller.color != Color::TRANSPARENT
-                                || (style.scroller.border.color
-                                    != Color::TRANSPARENT
-                                    && style.scroller.border.width > 0.0))
-                        {
-                            renderer.fill_quad(
-                                renderer::Quad {
-                                    bounds: scroller.bounds,
-                                    border: style.scroller.border,
-                                    ..renderer::Quad::default()
-                                },
-                                style.scroller.color,
-                            );
-                        }
+                    if let Some(scroller) = scrollbar.scroller
+                        && scroller.bounds.width > 0.0
+                        && scroller.bounds.height > 0.0
+                        && (style.scroller.color != Color::TRANSPARENT
+                            || (style.scroller.border.color
+                                != Color::TRANSPARENT
+                                && style.scroller.border.width > 0.0))
+                    {
+                        renderer.fill_quad(
+                            renderer::Quad {
+                                bounds: scroller.bounds,
+                                border: style.scroller.border,
+                                ..renderer::Quad::default()
+                            },
+                            style.scroller.color,
+                        );
                     }
                 };
 
diff --git a/widget/src/table.rs b/widget/src/table.rs
index 8fd41306..03537f9a 100644
--- a/widget/src/table.rs
+++ b/widget/src/table.rs
@@ -127,10 +127,10 @@ where
             }
         }
 
-        if width == Length::Shrink {
-            if let Some(first) = columns.first_mut() {
-                first.width = Length::Fill;
-            }
+        if width == Length::Shrink
+            && let Some(first) = columns.first_mut()
+        {
+            first.width = Length::Fill;
         }
 
         Self {
diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 451072a8..3657c817 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -689,22 +689,20 @@ where
                 }
             }
             Event::Window(window::Event::RedrawRequested(now)) => {
-                if let Some(focus) = &mut state.focus {
-                    if focus.is_window_focused {
-                        focus.now = *now;
+                if let Some(focus) = &mut state.focus
+                    && focus.is_window_focused
+                {
+                    focus.now = *now;
 
-                        let millis_until_redraw =
-                            Focus::CURSOR_BLINK_INTERVAL_MILLIS
-                                - (focus.now - focus.updated_at).as_millis()
-                                    % Focus::CURSOR_BLINK_INTERVAL_MILLIS;
+                    let millis_until_redraw =
+                        Focus::CURSOR_BLINK_INTERVAL_MILLIS
+                            - (focus.now - focus.updated_at).as_millis()
+                                % Focus::CURSOR_BLINK_INTERVAL_MILLIS;
 
-                        shell.request_redraw_at(
-                            focus.now
-                                + Duration::from_millis(
-                                    millis_until_redraw as u64,
-                                ),
-                        );
-                    }
+                    shell.request_redraw_at(
+                        focus.now
+                            + Duration::from_millis(millis_until_redraw as u64),
+                    );
                 }
             }
             _ => {}
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 3e849175..fa3dd770 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -1247,12 +1247,12 @@ where
             Event::Keyboard(keyboard::Event::KeyReleased { key, .. }) => {
                 let state = state::<Renderer>(tree);
 
-                if state.is_focused.is_some() {
-                    if let keyboard::Key::Character("v") = key.as_ref() {
-                        state.is_pasting = None;
+                if state.is_focused.is_some()
+                    && let keyboard::Key::Character("v") = key.as_ref()
+                {
+                    state.is_pasting = None;
 
-                        shell.capture_event();
-                    }
+                    shell.capture_event();
                 }
 
                 state.is_pasting = None;
@@ -1328,32 +1328,31 @@ where
             Event::Window(window::Event::RedrawRequested(now)) => {
                 let state = state::<Renderer>(tree);
 
-                if let Some(focus) = &mut state.is_focused {
-                    if focus.is_window_focused {
-                        if matches!(
-                            state.cursor.state(&self.value),
-                            cursor::State::Index(_)
-                        ) {
-                            focus.now = *now;
+                if let Some(focus) = &mut state.is_focused
+                    && focus.is_window_focused
+                {
+                    if matches!(
+                        state.cursor.state(&self.value),
+                        cursor::State::Index(_)
+                    ) {
+                        focus.now = *now;
 
-                            let millis_until_redraw =
-                                CURSOR_BLINK_INTERVAL_MILLIS
-                                    - (*now - focus.updated_at).as_millis()
-                                        % CURSOR_BLINK_INTERVAL_MILLIS;
+                        let millis_until_redraw = CURSOR_BLINK_INTERVAL_MILLIS
+                            - (*now - focus.updated_at).as_millis()
+                                % CURSOR_BLINK_INTERVAL_MILLIS;
 
-                            shell.request_redraw_at(
-                                *now + Duration::from_millis(
-                                    millis_until_redraw as u64,
-                                ),
-                            );
-                        }
-
-                        shell.request_input_method(&self.input_method(
-                            state,
-                            layout,
-                            &self.value,
-                        ));
+                        shell.request_redraw_at(
+                            *now + Duration::from_millis(
+                                millis_until_redraw as u64,
+                            ),
+                        );
                     }
+
+                    shell.request_input_method(&self.input_method(
+                        state,
+                        layout,
+                        &self.value,
+                    ));
                 }
             }
             _ => {}
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index c4e62863..0ad2c507 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -62,6 +62,7 @@ use window::WindowManager;
 use rustc_hash::FxHashMap;
 use std::borrow::Cow;
 use std::mem::ManuallyDrop;
+use std::slice;
 use std::sync::Arc;
 
 /// Runs a [`Program`] with the provided settings.
@@ -652,11 +653,11 @@ async fn run_instance<P>(
                         let now = Instant::now();
 
                         for (_id, window) in window_manager.iter_mut() {
-                            if let Some(redraw_at) = window.redraw_at {
-                                if redraw_at <= now {
-                                    window.raw.request_redraw();
-                                    window.redraw_at = None;
-                                }
+                            if let Some(redraw_at) = window.redraw_at
+                                && redraw_at <= now
+                            {
+                                window.raw.request_redraw();
+                                window.redraw_at = None;
                             }
                         }
 
@@ -760,7 +761,7 @@ async fn run_instance<P>(
 
                         let draw_span = debug::draw(id);
                         let (ui_state, _) = ui.update(
-                            &[redraw_event.clone()],
+                            slice::from_ref(&redraw_event),
                             cursor,
                             &mut window.renderer,
                             &mut clipboard,
@@ -1346,17 +1347,14 @@ fn run_action<'a, P, C>(
                 }
             }
             window::Action::ShowSystemMenu(id) => {
-                if let Some(window) = window_manager.get_mut(id) {
-                    if let mouse::Cursor::Available(point) =
+                if let Some(window) = window_manager.get_mut(id)
+                    && let mouse::Cursor::Available(point) =
                         window.state.cursor()
-                    {
-                        window.raw.show_window_menu(
-                            winit::dpi::LogicalPosition {
-                                x: point.x,
-                                y: point.y,
-                            },
-                        );
-                    }
+                {
+                    window.raw.show_window_menu(winit::dpi::LogicalPosition {
+                        x: point.x,
+                        y: point.y,
+                    });
                 }
             }
             window::Action::GetRawId(id, channel) => {
@@ -1375,20 +1373,20 @@ fn run_action<'a, P, C>(
                 }
             }
             window::Action::Screenshot(id, channel) => {
-                if let Some(window) = window_manager.get_mut(id) {
-                    if let Some(compositor) = compositor {
-                        let bytes = compositor.screenshot(
-                            &mut window.renderer,
-                            window.state.viewport(),
-                            window.state.background_color(),
-                        );
+                if let Some(window) = window_manager.get_mut(id)
+                    && let Some(compositor) = compositor
+                {
+                    let bytes = compositor.screenshot(
+                        &mut window.renderer,
+                        window.state.viewport(),
+                        window.state.background_color(),
+                    );
 
-                        let _ = channel.send(core::window::Screenshot::new(
-                            bytes,
-                            window.state.physical_size(),
-                            window.state.viewport().scale_factor(),
-                        ));
-                    }
+                    let _ = channel.send(core::window::Screenshot::new(
+                        bytes,
+                        window.state.physical_size(),
+                        window.state.viewport().scale_factor(),
+                    ));
                 }
             }
             window::Action::EnableMousePassthrough(id) => {