Merge pull request #97 from squidowl/update-iced

update iced

CHANGELOG.md

@@ -12,6 +12,10 @@ Changed:
 - Sorting channel nicknames
 - Title headers has been changed to also display user count for channels
 
+Fixed:
+
+- The last word of a message sometimes dissapeared
+
 # 2023.1-alpha1 (2023-06-30)
 
 Added:

Cargo.toml

@@ -32,5 +32,5 @@ features = ["v4"]
 members = ["data"]
 
 [patch.crates-io]
-iced = { git = "https://github.com/tarkah/iced", rev = "d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" }
-iced_core = { git = "https://github.com/tarkah/iced", rev = "d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" }
+iced = { git = "https://github.com/tarkah/iced", rev = "d79cedd8da99345947f5b9fcb1ebc3a145cc4112" }
+iced_core = { git = "https://github.com/tarkah/iced", rev = "d79cedd8da99345947f5b9fcb1ebc3a145cc4112" }

src/buffer/channel.rs

@@ -214,11 +214,9 @@ mod nick_list {
 
         container(
             scrollable(column)
-                .vertical_scroll(
-                    iced::widget::scrollable::Properties::new()
-                        .width(1)
-                        .scroller_width(1),
-                )
+                .direction(scrollable::Direction::Vertical(
+                    scrollable::Properties::new().width(1).scroller_width(1),
+                ))
                 .style(theme::Scrollable::Hidden),
         )
         .width(Length::Shrink)

src/buffer/scroll_view.rs

@@ -84,12 +84,12 @@ pub fn view<'a>(
     };
 
     scrollable(container(content).width(Length::Fill).padding([0, 8]))
-        .vertical_scroll(
+        .direction(scrollable::Direction::Vertical(
             scrollable::Properties::default()
                 .alignment(status.alignment())
                 .width(5)
                 .scroller_width(5),
-        )
+        ))
         .on_scroll(move |viewport| Message::Scrolled {
             count,
             remaining,

src/screen/dashboard/side_menu.rs

@@ -106,11 +106,11 @@ impl SideMenu {
         }
 
         container(
-            scrollable(column).vertical_scroll(
+            scrollable(column).direction(scrollable::Direction::Vertical(
                 iced::widget::scrollable::Properties::default()
                     .width(0)
                     .scroller_width(0),
-            ),
+            )),
         )
         .padding([8, 0, 6, 6])
         .center_x()

src/widget/selectable_text.rs

@@ -135,7 +135,7 @@ where
 
         let bounds = limits.max();
 
-        let (width, height) = renderer.measure(
+        let Size { width, height } = renderer.measure(
             &self.content,
             size,
             self.line_height,