Merge pull request #766 from squidowl/iced-97f1db3783dca5a4f60a9f8966…

…8613de4dfe9edd Iced 97f1db3783dca5a4f60a9f89668613de4dfe9edd
squidowl · Feb 13, 2025 · 476713d · 476713d
2 parents fbbde68 + 2555fca
commit 476713d
Show file tree

Hide file tree

Showing 17 changed files with 428 additions and 154 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,5 +70,5 @@ windows_exe_info = "0.4"
 members = ["data", "ipc", "irc", "irc/proto"]
 
 [patch.crates-io]
-iced = { git = "https://github.com/iced-rs/iced", rev = "e722c4ee4f80833ba0b1013cadd546ebc3f490ce" }
-iced_core = { git = "https://github.com/iced-rs/iced", rev = "e722c4ee4f80833ba0b1013cadd546ebc3f490ce" }
+iced = { git = "https://github.com/iced-rs/iced", rev = "97f1db3783dca5a4f60a9f89668613de4dfe9edd" }
+iced_core = { git = "https://github.com/iced-rs/iced", rev = "97f1db3783dca5a4f60a9f89668613de4dfe9edd" }
diff --git a/src/buffer/scroll_view.rs b/src/buffer/scroll_view.rs
@@ -1155,7 +1155,7 @@ mod correct_viewport {
                 move |state: &mut Option<keyed::Hit>,
                       inner: &mut Element<'a, Message>,
                       tree: &mut advanced::widget::Tree,
-                      event: iced::Event,
+                      event: &iced::Event,
                       layout: advanced::Layout<'_>,
                       cursor: advanced::mouse::Cursor,
                       renderer: &Renderer,
@@ -1243,13 +1243,10 @@ mod correct_viewport {
 
                     // Merge shell (we can't use Shell::merge as we'd lose access to messages)
                     {
-                        if let Some(new) = local_shell.redraw_request() {
-                            match new {
-                                iced::window::RedrawRequest::NextFrame => shell.request_redraw(),
-                                iced::window::RedrawRequest::At(instant) => {
-                                    shell.request_redraw_at(instant)
-                                }
-                            }
+                        match local_shell.redraw_request() {
+                            iced::window::RedrawRequest::NextFrame => shell.request_redraw(),
+                            iced::window::RedrawRequest::At(at) => shell.request_redraw_at(at),
+                            iced::window::RedrawRequest::Wait => {}
                         }
 
                         if local_shell.is_layout_invalid() {

diff --git a/src/screen/dashboard/sidebar.rs b/src/screen/dashboard/sidebar.rs
@@ -365,7 +365,7 @@ impl Sidebar {
                         .height(Length::Fill)
                         .center_x(Length::Shrink)
                         .padding(padding)
-                        .max_width(config.width)
+                        .max_width(f32::from(config.width))
                         .into(),
                 )
             }

diff --git a/src/stream.rs b/src/stream.rs
@@ -1,7 +1,33 @@
+use std::hash::Hash;
+
 pub use data::stream::{self, *};
 use data::{config, server};
+use futures::Stream;
 use iced::Subscription;
 
 pub fn run(entry: server::Entry, proxy: Option<config::Proxy>) -> Subscription<stream::Update> {
-    Subscription::run_with_id(entry.server.clone(), stream::run(entry, proxy))
+    struct State {
+        entry: server::Entry,
+        proxy: Option<config::Proxy>,
+    }
+
+    impl State {
+        fn run(&self) -> impl Stream<Item = stream::Update> {
+            stream::run(self.entry.clone(), self.proxy.clone())
+        }
+    }
+
+    impl PartialEq for State {
+        fn eq(&self, other: &Self) -> bool {
+            self.entry.server.eq(&other.entry.server)
+        }
+    }
+
+    impl Hash for State {
+        fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+            self.entry.server.hash(state);
+        }
+    }
+
+    Subscription::run_with(State { entry, proxy }, State::run)
 }
diff --git a/src/widget/anchored_overlay.rs b/src/widget/anchored_overlay.rs
@@ -99,7 +99,7 @@ impl<Message> Widget<Message, Theme, Renderer> for AnchoredOverlay<'_, Message>
     fn update(
         &mut self,
         tree: &mut widget::Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -253,7 +253,7 @@ impl<Message> overlay::Overlay<Message, Theme, Renderer> for Overlay<'_, '_, Mes
 
     fn update(
         &mut self,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,

diff --git a/src/widget/color_picker.rs b/src/widget/color_picker.rs
@@ -306,7 +306,7 @@ fn picker<'a, Message: 'a>(
             move |state: &mut Option<Rectangle>,
                   _inner: &mut Element<'a, Message>,
                   _tree: &mut advanced::widget::Tree,
-                  event: iced::Event,
+                  event: &iced::Event,
                   layout: advanced::Layout<'_>,
                   cursor: advanced::mouse::Cursor,
                   _renderer: &Renderer,

diff --git a/src/widget/combo_box.rs b/src/widget/combo_box.rs
@@ -406,7 +406,7 @@ where
     fn update(
         &mut self,
         tree: &mut widget::Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -429,7 +429,7 @@ where
         let mut tree = self.state.text_input_tree();
         self.text_input.update(
             &mut tree,
-            event.clone(),
+            event,
             layout,
             cursor,
             renderer,
@@ -443,15 +443,10 @@ where
             shell.capture_event();
         }
 
-        if let Some(redraw_request) = local_shell.redraw_request() {
-            match redraw_request {
-                window::RedrawRequest::NextFrame => {
-                    shell.request_redraw();
-                }
-                window::RedrawRequest::At(at) => {
-                    shell.request_redraw_at(at);
-                }
-            }
+        match local_shell.redraw_request() {
+            window::RedrawRequest::NextFrame => shell.request_redraw(),
+            window::RedrawRequest::At(at) => shell.request_redraw_at(at),
+            window::RedrawRequest::Wait => {}
         }
 
         // Then finally react to them here
@@ -583,7 +578,7 @@ where
                 let mut tree = state.text_input_tree();
                 self.text_input.update(
                     &mut tree,
-                    Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)),
+                    &Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)),
                     layout,
                     mouse::Cursor::Unavailable,
                     renderer,

diff --git a/src/widget/context_menu.rs b/src/widget/context_menu.rs
@@ -162,7 +162,7 @@ where
     fn update(
         &mut self,
         tree: &mut widget::Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -462,7 +462,7 @@ where
 
     fn update(
         &mut self,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,

diff --git a/src/widget/decorate.rs b/src/widget/decorate.rs
@@ -283,7 +283,7 @@ pub trait Update<'a, Message, Theme, Renderer, State> {
         state: &mut State,
         inner: &mut Element<'a, Message, Theme, Renderer>,
         tree: &mut advanced::widget::Tree,
-        event: iced::Event,
+        event: &iced::Event,
         layout: advanced::Layout<'_>,
         cursor: advanced::mouse::Cursor,
         renderer: &Renderer,
@@ -302,7 +302,7 @@ where
         _state: &mut State,
         inner: &mut Element<'a, Message, Theme, Renderer>,
         tree: &mut advanced::widget::Tree,
-        event: iced::Event,
+        event: &iced::Event,
         layout: advanced::Layout<'_>,
         cursor: advanced::mouse::Cursor,
         renderer: &Renderer,
@@ -322,7 +322,7 @@ where
             &mut State,
             &mut Element<'a, Message, Theme, Renderer>,
             &mut advanced::widget::Tree,
-            iced::Event,
+            &iced::Event,
             advanced::Layout<'_>,
             advanced::mouse::Cursor,
             &Renderer,
@@ -336,7 +336,7 @@ where
         state: &mut State,
         inner: &mut Element<'a, Message, Theme, Renderer>,
         tree: &mut advanced::widget::Tree,
-        event: iced::Event,
+        event: &iced::Event,
         layout: advanced::Layout<'_>,
         cursor: advanced::mouse::Cursor,
         renderer: &Renderer,
@@ -669,7 +669,7 @@ where
     fn update(
         &mut self,
         tree: &mut advanced::widget::Tree,
-        event: iced::Event,
+        event: &iced::Event,
         layout: advanced::Layout<'_>,
         cursor: advanced::mouse::Cursor,
         renderer: &Renderer,

diff --git a/src/widget/double_click.rs b/src/widget/double_click.rs
@@ -21,7 +21,7 @@ where
             move |state: &mut Internal,
                   inner: &mut Element<'a, Message>,
                   tree: &mut Tree,
-                  event: iced::Event,
+                  event: &iced::Event,
                   layout: Layout<'_>,
                   cursor: mouse::Cursor,
                   renderer: &Renderer,
@@ -30,7 +30,7 @@ where
                   viewport: &iced::Rectangle| {
                 inner.as_widget_mut().update(
                     tree,
-                    event.clone(),
+                    event,
                     layout,
                     cursor,
                     renderer,

diff --git a/src/widget/key_press.rs b/src/widget/key_press.rs
@@ -18,7 +18,7 @@ where
             move |_state: &mut (),
                   inner: &mut Element<'a, Message>,
                   tree: &mut widget::Tree,
-                  event: Event,
+                  event: &Event,
                   layout: Layout<'_>,
                   cursor: mouse::Cursor,
                   renderer: &Renderer,

diff --git a/src/widget/modal.rs b/src/widget/modal.rs
@@ -78,7 +78,7 @@ where
     fn update(
         &mut self,
         state: &mut widget::Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
@@ -194,7 +194,7 @@ where
 
     fn update(
         &mut self,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,

diff --git a/src/widget/notify_visibility.rs b/src/widget/notify_visibility.rs
@@ -31,7 +31,7 @@ where
             move |_state: &mut (),
                   inner: &mut Element<'a, Message>,
                   tree: &mut widget::Tree,
-                  event: Event,
+                  event: &Event,
                   layout: Layout<'_>,
                   cursor: mouse::Cursor,
                   renderer: &Renderer,

diff --git a/src/widget/selectable_rich_text.rs b/src/widget/selectable_rich_text.rs
@@ -324,7 +324,7 @@ where
     fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,

diff --git a/src/widget/selectable_text.rs b/src/widget/selectable_text.rs
@@ -175,7 +175,7 @@ where
     fn update(
         &mut self,
         tree: &mut Tree,
-        event: iced::Event,
+        event: &iced::Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         _renderer: &Renderer,

diff --git a/src/widget/shortcut.rs b/src/widget/shortcut.rs
@@ -20,7 +20,7 @@ where
             move |modifiers: &mut shortcut::Modifiers,
                   inner: &mut Element<'a, Message>,
                   tree: &mut Tree,
-                  event: iced::Event,
+                  event: &iced::Event,
                   layout: Layout<'_>,
                   cursor: mouse::Cursor,
                   renderer: &Renderer,