Merge pull request #1255 from squidowl/iced-update

Iced Update

Author: andymandias

Cargo.lock

@@ -104,9 +104,9 @@ embed-resource = "3.0.2"
 windows_exe_info = "0.4"
 
 [patch.crates-io]
-iced = { git = "https://github.com/squidowl/iced", rev = "489f3aeac407c1a69a67274a9b8daae6e5fb4a13" }
-iced_core = { git = "https://github.com/squidowl/iced", rev = "489f3aeac407c1a69a67274a9b8daae6e5fb4a13" }
-iced_wgpu = { git = "https://github.com/squidowl/iced", rev = "489f3aeac407c1a69a67274a9b8daae6e5fb4a13" }
+iced = { git = "https://github.com/squidowl/iced", rev = "ef5e3c9855d7e4768281423f0f845c57064710d8" }
+iced_core = { git = "https://github.com/squidowl/iced", rev = "ef5e3c9855d7e4768281423f0f845c57064710d8" }
+iced_wgpu = { git = "https://github.com/squidowl/iced", rev = "ef5e3c9855d7e4768281423f0f845c57064710d8" }
 
 [profile.ci]
 inherits = "dev"

Cargo.toml

@@ -1,10 +1,8 @@
 use chrono::{DateTime, Local, Utc};
 use data::user::{ChannelUsers, NickRef};
 use data::{Config, Server, User, isupport, message, target};
-use iced::widget::{
-    Scrollable, column, container, horizontal_rule, row, scrollable,
-};
-use iced::{padding, Color, Length};
+use iced::widget::{Scrollable, column, container, row, rule, scrollable};
+use iced::{Color, Length, padding};
 
 use super::context_menu;
 use crate::widget::{Element, double_pass, message_content, selectable_text};
@@ -140,7 +138,7 @@ pub fn view<'a>(
                 .padding(padding()),
             column![container(scrollable)].width(Length::Fill),
         ),
-        container(horizontal_rule(1))
+        container(rule::horizontal(1))
             .width(Length::Fill)
             .padding([0, 11])
     ]

src/buffer/channel/topic.rs

@@ -2,9 +2,7 @@ use chrono::{DateTime, Local, Utc};
 use data::dashboard::BufferAction;
 use data::user::Nick;
 use data::{Config, Server, User, config, ctcp, isupport, target};
-use iced::widget::{
-    Space, button, column, container, horizontal_rule, row, text,
-};
+use iced::widget::{Space, button, column, container, row, rule, text};
 use iced::{Length, Padding, padding};
 
 use crate::widget::{Element, context_menu, double_pass};
@@ -213,9 +211,9 @@ impl Entry {
             ),
             (Entry::HorizontalRule, _) => match length {
                 Length::Fill => {
-                    container(horizontal_rule(1)).padding([0, 6]).into()
+                    container(rule::horizontal(1)).padding([0, 6]).into()
                 }
-                _ => Space::new(length, 1).into(),
+                _ => Space::new().width(length).height(1).into(),
             },
             (Entry::CtcpRequestTime, Context::User { server, user, .. }) => {
                 let message = Message::CtcpRequest(

src/buffer/context_menu.rs

@@ -9,7 +9,9 @@ use data::rate_limit::TokenPriority;
 use data::target::Target;
 use data::user::Nick;
 use data::{Config, User, client, command};
-use iced::widget::{column, container, row, text, text_input, vertical_rule};
+use iced::widget::{
+    self, column, container, operation, row, rule, text, text_input,
+};
 use iced::{Alignment, Task, padding};
 use tokio::time;
 
@@ -125,7 +127,7 @@ pub fn view<'a>(
         });
 
     let maybe_vertical_rule =
-        maybe_our_user.is_some().then(move || vertical_rule(1.0));
+        maybe_our_user.is_some().then(move || rule::vertical(1.0));
 
     let mut content = column![
         container(
@@ -190,7 +192,7 @@ fn error<'a, 'b, Message: 'a>(
 
 #[derive(Debug, Clone)]
 pub struct State {
-    input_id: text_input::Id,
+    input_id: widget::Id,
     error: Option<String>,
     completion: Completion,
     selected_history: Option<usize>,
@@ -205,7 +207,7 @@ impl Default for State {
 impl State {
     pub fn new() -> Self {
         Self {
-            input_id: text_input::Id::unique(),
+            input_id: widget::Id::unique(),
             error: None,
             completion: Completion::default(),
             selected_history: None,
@@ -851,17 +853,17 @@ impl State {
             });
         }
 
-        (text_input::move_cursor_to_end(self.input_id.clone()), None)
+        (operation::move_cursor_to_end(self.input_id.clone()), None)
     }
 
     pub fn focus(&self) -> Task<Message> {
         let input_id = self.input_id.clone();
 
-        text_input::is_focused(input_id.clone()).then(move |is_focused| {
+        operation::is_focused(input_id.clone()).then(move |is_focused| {
             if is_focused {
                 Task::none()
             } else {
-                text_input::focus(input_id.clone())
+                operation::focus(input_id.clone())
             }
         })
     }
@@ -903,7 +905,7 @@ impl State {
 
         history.record_draft(RawInput { buffer, text });
 
-        text_input::move_cursor_to_end(self.input_id.clone())
+        operation::move_cursor_to_end(self.input_id.clone())
     }
 
     pub fn close_picker(&mut self) -> bool {

src/buffer/input_view.rs

@@ -5,7 +5,7 @@ use data::preview::{self, Previews};
 use data::target::{self, Target};
 use data::user::Nick;
 use data::{Config, Server, User, buffer, history, message};
-use iced::widget::{column, container, vertical_space};
+use iced::widget::{column, container, space};
 use iced::{Length, Size, Task};
 
 use super::message_view::{ChannelQueryLayout, TargetInfo};
@@ -94,7 +94,7 @@ pub fn view<'a>(
 
     let text_input = show_text_input.then(|| {
         column![
-            vertical_space().height(4),
+            space::vertical().height(4),
             input_view::view(
                 &state.input_view,
                 input,