Merge pull request #401 from squidowl/chore/iced-update

updated iced to master

Cargo.toml

@@ -52,5 +52,5 @@ embed-resource = "2.1.1"
 members = ["data", "ipc", "irc", "irc/proto"]
 
 [patch.crates-io]
-iced = { git = "https://github.com/iced-rs/iced", rev = "e69e2c0ee89266fcabe272d991c7dd4150b02270" }
-iced_core = { git = "https://github.com/iced-rs/iced", rev = "e69e2c0ee89266fcabe272d991c7dd4150b02270" }
+iced = { git = "https://github.com/iced-rs/iced", rev = "19db068bbbebcda1756720525da247f35bd3a5e0" }
+iced_core = { git = "https://github.com/iced-rs/iced", rev = "19db068bbbebcda1756720525da247f35bd3a5e0" }

src/buffer.rs

@@ -1,7 +1,7 @@
 pub use data::buffer::Settings;
 use data::user::Nick;
 use data::{buffer, file_transfer, history, Config};
-use iced::Command;
+use iced::Task;
 
 use self::channel::Channel;
 use self::file_transfers::FileTransfers;
@@ -62,7 +62,7 @@ impl Buffer {
         history: &mut history::Manager,
         file_transfers: &mut file_transfer::Manager,
         config: &Config,
-    ) -> (Command<Message>, Option<Event>) {
+    ) -> (Task<Message>, Option<Event>) {
         match (self, message) {
             (Buffer::Channel(state), Message::Channel(message)) => {
                 let (command, event) = state.update(message, clients, history);
@@ -92,7 +92,7 @@ impl Buffer {
 
                 (command.map(Message::FileTransfers), None)
             }
-            _ => (Command::none(), None),
+            _ => (Task::none(), None),
         }
     }
 
@@ -148,18 +148,18 @@ impl Buffer {
         }
     }
 
-    pub fn focus(&self) -> Command<Message> {
+    pub fn focus(&self) -> Task<Message> {
         match self {
-            Buffer::Empty | Buffer::FileTransfers(_) => Command::none(),
+            Buffer::Empty | Buffer::FileTransfers(_) => Task::none(),
             Buffer::Channel(channel) => channel.focus().map(Message::Channel),
             Buffer::Server(server) => server.focus().map(Message::Server),
             Buffer::Query(query) => query.focus().map(Message::Query),
         }
     }
 
-    pub fn reset(&self) -> Command<Message> {
+    pub fn reset(&self) -> Task<Message> {
         match self {
-            Buffer::Empty | Buffer::FileTransfers(_) => Command::none(),
+            Buffer::Empty | Buffer::FileTransfers(_) => Task::none(),
             Buffer::Channel(channel) => channel.reset().map(Message::Channel),
             Buffer::Server(server) => server.reset().map(Message::Server),
             Buffer::Query(query) => query.reset().map(Message::Query),
@@ -170,10 +170,10 @@ impl Buffer {
         &mut self,
         nick: Nick,
         history: &mut history::Manager,
-    ) -> Command<Message> {
+    ) -> Task<Message> {
         if let Some(buffer) = self.data() {
             match self {
-                Buffer::Empty | Buffer::Server(_) | Buffer::FileTransfers(_) => Command::none(),
+                Buffer::Empty | Buffer::Server(_) | Buffer::FileTransfers(_) => Task::none(),
                 Buffer::Channel(channel) => channel
                     .input_view
                     .insert_user(nick, buffer, history)
@@ -184,13 +184,13 @@ impl Buffer {
                     .map(|message| Message::Query(query::Message::InputView(message))),
             }
         } else {
-            Command::none()
+            Task::none()
         }
     }
 
-    pub fn scroll_to_start(&mut self) -> Command<Message> {
+    pub fn scroll_to_start(&mut self) -> Task<Message> {
         match self {
-            Buffer::Empty | Buffer::FileTransfers(_) => Command::none(),
+            Buffer::Empty | Buffer::FileTransfers(_) => Task::none(),
             Buffer::Channel(channel) => channel
                 .scroll_view
                 .scroll_to_start()
@@ -206,9 +206,9 @@ impl Buffer {
         }
     }
 
-    pub fn scroll_to_end(&mut self) -> Command<Message> {
+    pub fn scroll_to_end(&mut self) -> Task<Message> {
         match self {
-            Buffer::Empty | Buffer::FileTransfers(_) => Command::none(),
+            Buffer::Empty | Buffer::FileTransfers(_) => Task::none(),
             Buffer::Channel(channel) => channel
                 .scroll_view
                 .scroll_to_end()

src/buffer/channel.rs

@@ -3,7 +3,7 @@ use data::user::Nick;
 use data::User;
 use data::{channel, history, message, Config};
 use iced::widget::{column, container, row};
-use iced::{Command, Length};
+use iced::{Task, Length};
 
 use super::{input_view, scroll_view, user_context};
 use crate::theme;
@@ -225,7 +225,7 @@ impl Channel {
         message: Message,
         clients: &mut data::client::Map,
         history: &mut history::Manager,
-    ) -> (Command<Message>, Option<Event>) {
+    ) -> (Task<Message>, Option<Event>) {
         match message {
             Message::ScrollView(message) => {
                 let (command, event) = self.scroll_view.update(message);
@@ -242,7 +242,7 @@ impl Channel {
 
                 match event {
                     Some(input_view::Event::InputSent) => {
-                        let command = Command::batch(vec![
+                        let command = Task::batch(vec![
                             command,
                             self.scroll_view.scroll_to_end().map(Message::ScrollView),
                         ]);
@@ -253,17 +253,17 @@ impl Channel {
                 }
             }
             Message::UserContext(message) => (
-                Command::none(),
+                Task::none(),
                 Some(Event::UserContext(user_context::update(message))),
             ),
         }
     }
 
-    pub fn focus(&self) -> Command<Message> {
+    pub fn focus(&self) -> Task<Message> {
         self.input_view.focus().map(Message::InputView)
     }
 
-    pub fn reset(&self) -> Command<Message> {
+    pub fn reset(&self) -> Task<Message> {
         self.input_view.reset().map(Message::InputView)
     }
 }

src/buffer/file_transfers.rs

@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use data::{file_transfer, Config};
 use iced::widget::{button, center, column, container, scrollable, text, Scrollable};
-use iced::{Command, Length};
+use iced::{Task, Length};
 
 use crate::widget::{Element, Text};
 use crate::{icon, theme};
@@ -68,12 +68,12 @@ impl FileTransfers {
         message: Message,
         file_transfers: &mut file_transfer::Manager,
         config: &Config,
-    ) -> Command<Message> {
+    ) -> Task<Message> {
         match message {
             Message::Approve(id) => {
                 if let Some(transfer) = file_transfers.get(&id).cloned() {
                     let save_directory = config.file_transfer.save_directory.clone();
-                    return Command::perform(
+                    return Task::perform(
                         async move {
                             rfd::AsyncFileDialog::new()
                                 .set_directory(save_directory)
@@ -96,7 +96,7 @@ impl FileTransfers {
             }
         }
 
-        Command::none()
+        Task::none()
     }
 }
 

src/buffer/input_view.rs

@@ -4,7 +4,7 @@ use data::input::{Cache, Draft};
 use data::isupport;
 use data::user::{Nick, User};
 use data::{client, history, Buffer, Input};
-use iced::Command;
+use iced::Task;
 
 use crate::widget::{input, Element};
 
@@ -68,12 +68,12 @@ impl State {
         message: Message,
         clients: &mut client::Map,
         history: &mut history::Manager,
-    ) -> (Command<Message>, Option<Event>) {
+    ) -> (Task<Message>, Option<Event>) {
         match message {
             Message::Input(draft) => {
                 history.record_draft(draft);
 
-                (Command::none(), None)
+                (Task::none(), None)
             }
             Message::Send(input) => {
                 if let Some(encoded) = input.encoded() {
@@ -95,7 +95,7 @@ impl State {
                     history.record_input(input, user);
                 }
 
-                (Command::none(), Some(Event::InputSent))
+                (Task::none(), Some(Event::InputSent))
             }
             Message::Completion(draft) => {
                 history.record_draft(draft);
@@ -105,11 +105,11 @@ impl State {
         }
     }
 
-    pub fn focus(&self) -> Command<Message> {
+    pub fn focus(&self) -> Task<Message> {
         input::focus(self.input_id.clone())
     }
 
-    pub fn reset(&self) -> Command<Message> {
+    pub fn reset(&self) -> Task<Message> {
         input::reset(self.input_id.clone())
     }
 
@@ -118,7 +118,7 @@ impl State {
         nick: Nick,
         buffer: Buffer,
         history: &mut history::Manager,
-    ) -> Command<Message> {
+    ) -> Task<Message> {
         let mut text = history.input(&buffer).draft.to_string();
 
         if text.is_empty() {

src/buffer/query.rs

@@ -1,7 +1,7 @@
 use data::user::Nick;
 use data::{history, message, Config, Server};
 use iced::widget::{column, container, row, vertical_space};
-use iced::{Command, Length};
+use iced::{Task, Length};
 
 use super::{input_view, scroll_view, user_context};
 use crate::theme;
@@ -178,7 +178,7 @@ impl Query {
         message: Message,
         clients: &mut data::client::Map,
         history: &mut history::Manager,
-    ) -> (Command<Message>, Option<Event>) {
+    ) -> (Task<Message>, Option<Event>) {
         match message {
             Message::ScrollView(message) => {
                 let (command, event) = self.scroll_view.update(message);
@@ -195,7 +195,7 @@ impl Query {
 
                 match event {
                     Some(input_view::Event::InputSent) => {
-                        let command = Command::batch(vec![
+                        let command = Task::batch(vec![
                             command,
                             self.scroll_view.scroll_to_end().map(Message::ScrollView),
                         ]);
@@ -208,11 +208,11 @@ impl Query {
         }
     }
 
-    pub fn focus(&self) -> Command<Message> {
+    pub fn focus(&self) -> Task<Message> {
         self.input_view.focus().map(Message::InputView)
     }
 
-    pub fn reset(&self) -> Command<Message> {
+    pub fn reset(&self) -> Task<Message> {
         self.input_view.reset().map(Message::InputView)
     }
 }

src/buffer/scroll_view.rs

@@ -3,7 +3,7 @@ use data::server::Server;
 use data::user::Nick;
 use data::{history, time, Config};
 use iced::widget::{column, container, horizontal_rule, row, text, scrollable, Scrollable};
-use iced::{Command, Length};
+use iced::{Task, Length};
 
 use super::user_context;
 use crate::theme;
@@ -144,7 +144,7 @@ impl State {
         Self::default()
     }
 
-    pub fn update(&mut self, message: Message) -> (Command<Message>, Option<Event>) {
+    pub fn update(&mut self, message: Message) -> (Task<Message>, Option<Event>) {
         match message {
             Message::Scrolled {
                 count,
@@ -213,16 +213,16 @@ impl State {
             }
             Message::UserContext(message) => {
                 return (
-                    Command::none(),
+                    Task::none(),
                     Some(Event::UserContext(user_context::update(message))),
                 );
             }
         }
 
-        (Command::none(), None)
+        (Task::none(), None)
     }
 
-    pub fn scroll_to_start(&mut self) -> Command<Message> {
+    pub fn scroll_to_start(&mut self) -> Task<Message> {
         self.status = Status::Idle(Anchor::Top);
         self.limit = Limit::top();
         scrollable::scroll_to(
@@ -231,7 +231,7 @@ impl State {
         )
     }
 
-    pub fn scroll_to_end(&mut self) -> Command<Message> {
+    pub fn scroll_to_end(&mut self) -> Task<Message> {
         self.status = Status::Idle(Anchor::Bottom);
         self.limit = Limit::bottom();
         scrollable::scroll_to(

src/buffer/server.rs

@@ -1,6 +1,6 @@
 use data::{history, message, Config};
 use iced::widget::{column, container, row, vertical_space};
-use iced::{Command, Length};
+use iced::{Task, Length};
 
 use super::{input_view, scroll_view};
 use crate::theme;
@@ -130,7 +130,7 @@ impl Server {
         message: Message,
         clients: &mut data::client::Map,
         history: &mut history::Manager,
-    ) -> Command<Message> {
+    ) -> Task<Message> {
         match message {
             Message::ScrollView(message) => {
                 let (command, _) = self.scroll_view.update(message);
@@ -141,7 +141,7 @@ impl Server {
                 let command = command.map(Message::InputView);
 
                 match event {
-                    Some(input_view::Event::InputSent) => Command::batch(vec![
+                    Some(input_view::Event::InputSent) => Task::batch(vec![
                         command,
                         self.scroll_view.scroll_to_end().map(Message::ScrollView),
                     ]),
@@ -151,11 +151,11 @@ impl Server {
         }
     }
 
-    pub fn focus(&self) -> Command<Message> {
+    pub fn focus(&self) -> Task<Message> {
         self.input_view.focus().map(Message::InputView)
     }
 
-    pub fn reset(&self) -> Command<Message> {
+    pub fn reset(&self) -> Task<Message> {
         self.input_view.reset().map(Message::InputView)
     }
 }

src/event.rs

@@ -13,7 +13,7 @@ pub fn events() -> Subscription<Event> {
     event::listen_with(filtered_events)
 }
 
-fn filtered_events(event: iced::Event, status: iced::event::Status) -> Option<Event> {
+fn filtered_events(event: iced::Event, status: iced::event::Status, _id: iced::window::Id) -> Option<Event> {
     let ignored = |status| matches!(status, iced::event::Status::Ignored);
 
     match &event {
@@ -34,7 +34,7 @@ fn filtered_events(event: iced::Event, status: iced::event::Status) -> Option<Ev
             key: keyboard::Key::Named(keyboard::key::Named::End),
             ..
         }) if ignored(status) => Some(Event::End),
-        iced::Event::Window(_, window::Event::CloseRequested) => Some(Event::CloseRequested),
+        iced::Event::Window(window::Event::CloseRequested) => Some(Event::CloseRequested),
         _ => None,
     }
 }