From 7554540b78e093ad1f12f293535c903f3889c350 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Sun, 22 Feb 2026 21:57:15 -0500
Subject: [PATCH] fix: update for applet widgets and grid

---
 src/applet/column.rs      | 61 ++++++++++++++++++++-------------------
 src/applet/row.rs         | 61 ++++++++++++++++++++-------------------
 src/widget/grid/widget.rs | 27 ++++++++---------
 3 files changed, 76 insertions(+), 73 deletions(-)

diff --git a/src/applet/column.rs b/src/applet/column.rs
index 8b3c68e9..9657b566 100644
--- a/src/applet/column.rs
+++ b/src/applet/column.rs
@@ -320,38 +320,25 @@ where
             }
         }
 
-        self.children
+        for (((i, child), state), c_layout) in self
+            .children
             .iter_mut()
             .enumerate()
             .zip(&mut tree.children)
             .zip(layout.children())
-            .map(|(((i, child), state), c_layout)| {
-                let mut cursor_virtual = cursor;
-                if matches!(
-                    event,
-                    Event::Mouse(mouse::Event::CursorMoved { .. } | mouse::Event::CursorEntered)
-                        | Event::Touch(
-                            iced_core::touch::Event::FingerMoved { .. }
-                                | iced_core::touch::Event::FingerPressed { .. }
-                        )
-                ) && cursor.is_over(c_layout.bounds())
-                {
-                    my_state.hovered = Some(i);
-                    return child.as_widget_mut().update(
-                        state,
-                        &event,
-                        c_layout.with_virtual_offset(layout.virtual_offset()),
-                        cursor_virtual,
-                        renderer,
-                        clipboard,
-                        shell,
-                        viewport,
-                    );
-                } else if my_state.hovered.is_some_and(|h| i != h) {
-                    cursor_virtual = mouse::Cursor::Unavailable;
-                }
-
-                child.as_widget_mut().update(
+        {
+            let mut cursor_virtual = cursor;
+            if matches!(
+                event,
+                Event::Mouse(mouse::Event::CursorMoved { .. } | mouse::Event::CursorEntered)
+                    | Event::Touch(
+                        iced_core::touch::Event::FingerMoved { .. }
+                            | iced_core::touch::Event::FingerPressed { .. }
+                    )
+            ) && cursor.is_over(c_layout.bounds())
+            {
+                my_state.hovered = Some(i);
+                return child.as_widget_mut().update(
                     state,
                     &event,
                     c_layout.with_virtual_offset(layout.virtual_offset()),
@@ -360,8 +347,22 @@ where
                     clipboard,
                     shell,
                     viewport,
-                )
-            });
+                );
+            } else if my_state.hovered.is_some_and(|h| i != h) {
+                cursor_virtual = mouse::Cursor::Unavailable;
+            }
+
+            child.as_widget_mut().update(
+                state,
+                &event,
+                c_layout.with_virtual_offset(layout.virtual_offset()),
+                cursor_virtual,
+                renderer,
+                clipboard,
+                shell,
+                viewport,
+            );
+        }
     }
 
     fn mouse_interaction(
diff --git a/src/applet/row.rs b/src/applet/row.rs
index 2a770503..a6745d1c 100644
--- a/src/applet/row.rs
+++ b/src/applet/row.rs
@@ -309,39 +309,26 @@ where
             }
         }
 
-        self.children
+        for (((i, child), state), c_layout) in self
+            .children
             .iter_mut()
             .enumerate()
             .zip(&mut tree.children)
             .zip(layout.children())
-            .map(|(((i, child), state), c_layout)| {
-                let mut cursor_virtual = cursor;
+        {
+            let mut cursor_virtual = cursor;
 
-                if matches!(
-                    event,
-                    Event::Mouse(mouse::Event::CursorMoved { .. } | mouse::Event::CursorEntered)
-                        | Event::Touch(
-                            iced_core::touch::Event::FingerMoved { .. }
-                                | iced_core::touch::Event::FingerPressed { .. }
-                        )
-                ) && cursor.is_over(c_layout.bounds())
-                {
-                    my_state.hovered = Some(i);
-                    return child.as_widget_mut().update(
-                        state,
-                        &event,
-                        c_layout.with_virtual_offset(layout.virtual_offset()),
-                        cursor_virtual,
-                        renderer,
-                        clipboard,
-                        shell,
-                        viewport,
-                    );
-                } else if my_state.hovered.is_some_and(|h| i != h) {
-                    cursor_virtual = mouse::Cursor::Unavailable;
-                }
-
-                child.as_widget_mut().update(
+            if matches!(
+                event,
+                Event::Mouse(mouse::Event::CursorMoved { .. } | mouse::Event::CursorEntered)
+                    | Event::Touch(
+                        iced_core::touch::Event::FingerMoved { .. }
+                            | iced_core::touch::Event::FingerPressed { .. }
+                    )
+            ) && cursor.is_over(c_layout.bounds())
+            {
+                my_state.hovered = Some(i);
+                return child.as_widget_mut().update(
                     state,
                     &event,
                     c_layout.with_virtual_offset(layout.virtual_offset()),
@@ -350,8 +337,22 @@ where
                     clipboard,
                     shell,
                     viewport,
-                )
-            });
+                );
+            } else if my_state.hovered.is_some_and(|h| i != h) {
+                cursor_virtual = mouse::Cursor::Unavailable;
+            }
+
+            child.as_widget_mut().update(
+                state,
+                &event,
+                c_layout.with_virtual_offset(layout.virtual_offset()),
+                cursor_virtual,
+                renderer,
+                clipboard,
+                shell,
+                viewport,
+            );
+        }
     }
 
     fn mouse_interaction(
diff --git a/src/widget/grid/widget.rs b/src/widget/grid/widget.rs
index f88dfc2a..e59ba90d 100644
--- a/src/widget/grid/widget.rs
+++ b/src/widget/grid/widget.rs
@@ -189,22 +189,23 @@ impl<Message: 'static + Clone> Widget<Message, crate::Theme, Renderer> for Grid<
         shell: &mut Shell<'_, Message>,
         viewport: &Rectangle,
     ) {
-        self.children
+        for ((child, state), c_layout) in self
+            .children
             .iter_mut()
             .zip(&mut tree.children)
             .zip(layout.children())
-            .map(|((child, state), c_layout)| {
-                child.as_widget_mut().update(
-                    state,
-                    event,
-                    c_layout.with_virtual_offset(layout.virtual_offset()),
-                    cursor,
-                    renderer,
-                    clipboard,
-                    shell,
-                    viewport,
-                )
-            });
+        {
+            child.as_widget_mut().update(
+                state,
+                event,
+                c_layout.with_virtual_offset(layout.virtual_offset()),
+                cursor,
+                renderer,
+                clipboard,
+                shell,
+                viewport,
+            );
+        }
     }
 
     fn mouse_interaction(