Merge pull request #2662 from iced-rs/reactive-rendering

Reactive Rendering

1 files changed, 17 insertions, 23 deletions

diff --git a/widget/src/pane_grid/title_bar.rs b/widget/src/pane_grid/title_bar.rs
index 5002b4f7..3f4a651e 100644
--- a/widget/src/pane_grid/title_bar.rs
+++ b/widget/src/pane_grid/title_bar.rs
@@ -1,13 +1,12 @@
 use crate::container;
-use crate::core::event::{self, Event};
 use crate::core::layout;
 use crate::core::mouse;
 use crate::core::overlay;
 use crate::core::renderer;
 use crate::core::widget::{self, Tree};
 use crate::core::{
-    self, Clipboard, Element, Layout, Padding, Point, Rectangle, Shell, Size,
-    Vector,
+    self, Clipboard, Element, Event, Layout, Padding, Point, Rectangle, Shell,
+    Size, Vector,
 };
 use crate::pane_grid::controls::Controls;
 
@@ -428,7 +427,7 @@ where
         }
     }
 
-    pub(crate) fn on_event(
+    pub(crate) fn update(
         &mut self,
         tree: &mut Tree,
         event: Event,
@@ -438,7 +437,7 @@ where
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
         viewport: &Rectangle,
-    ) -> event::Status {
+    ) {
         let mut children = layout.children();
         let padded = children.next().unwrap();
 
@@ -446,15 +445,16 @@ where
         let title_layout = children.next().unwrap();
         let mut show_title = true;
 
-        let control_status = if let Some(controls) = &mut self.controls {
+        if let Some(controls) = &mut self.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_mut() {
                     let compact_layout = children.next().unwrap();
 
-                    compact.as_widget_mut().on_event(
+                    compact.as_widget_mut().update(
                         &mut tree.children[2],
                         event.clone(),
                         compact_layout,
@@ -463,11 +463,11 @@ where
                         clipboard,
                         shell,
                         viewport,
-                    )
+                    );
                 } else {
                     show_title = false;
 
-                    controls.full.as_widget_mut().on_event(
+                    controls.full.as_widget_mut().update(
                         &mut tree.children[1],
                         event.clone(),
                         controls_layout,
@@ -476,10 +476,10 @@ where
                         clipboard,
                         shell,
                         viewport,
-                    )
+                    );
                 }
             } else {
-                controls.full.as_widget_mut().on_event(
+                controls.full.as_widget_mut().update(
                     &mut tree.children[1],
                     event.clone(),
                     controls_layout,
@@ -488,14 +488,12 @@ where
                     clipboard,
                     shell,
                     viewport,
-                )
+                );
             }
-        } else {
-            event::Status::Ignored
-        };
+        }
 
-        let title_status = if show_title {
-            self.content.as_widget_mut().on_event(
+        if show_title {
+            self.content.as_widget_mut().update(
                 &mut tree.children[0],
                 event,
                 title_layout,
@@ -504,12 +502,8 @@ where
                 clipboard,
                 shell,
                 viewport,
-            )
-        } else {
-            event::Status::Ignored
-        };
-
-        control_status.merge(title_status)
+            );
+        }
     }
 
     pub(crate) fn mouse_interaction(