From 2bf7cbc2cfded3f47a8d90dd15b3abeda4d279c3 Mon Sep 17 00:00:00 2001 From: Cory Forsstrom Date: Wed, 28 Jun 2023 21:51:00 -0700 Subject: [PATCH 1/2] update iced --- Cargo.lock | 29 +++++++++++++++-------------- Cargo.toml | 4 ++-- src/buffer/channel.rs | 8 +++----- src/buffer/scroll_view.rs | 4 ++-- src/screen/dashboard/side_menu.rs | 4 ++-- src/widget/selectable_text.rs | 2 +- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d76825a84..0bb907398 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -453,7 +453,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.8.0" -source = "git+https://github.com/hecrj/cosmic-text.git?rev=e8b10fd675832cb9c1cc9de30922beb4cf883876#e8b10fd675832cb9c1cc9de30922beb4cf883876" +source = "git+https://github.com/hecrj/cosmic-text.git?rev=c3cd24dc972bb8fd55d016c81ac9fa637e0a4ada#c3cd24dc972bb8fd55d016c81ac9fa637e0a4ada" dependencies = [ "aliasable", "fontdb", @@ -987,7 +987,7 @@ dependencies = [ [[package]] name = "glyphon" version = "0.2.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=8dbf36020e5759fa9144517b321372266160113e#8dbf36020e5759fa9144517b321372266160113e" +source = "git+https://github.com/hecrj/glyphon.git?rev=8324f20158a62f8520bad4ed09f6aa5552f8f2a6#8324f20158a62f8520bad4ed09f6aa5552f8f2a6" dependencies = [ "cosmic-text", "etagere", @@ -1171,7 +1171,7 @@ dependencies = [ [[package]] name = "iced" version = "0.9.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "iced_core", "iced_futures", @@ -1185,7 +1185,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.9.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "bitflags 1.3.2", "instant", @@ -1198,7 +1198,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.6.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "futures", "iced_core", @@ -1211,28 +1211,29 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.8.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "bitflags 1.3.2", "bytemuck", "glam", + "half", "iced_core", "image", "kamadak-exif", "log", "raw-window-handle", "thiserror", - "tiny-skia 0.9.1", ] [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "iced_graphics", "iced_tiny_skia", "iced_wgpu", + "log", "raw-window-handle", "thiserror", ] @@ -1240,7 +1241,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.1.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "iced_core", "iced_futures", @@ -1250,7 +1251,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.8.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "iced_core", "once_cell", @@ -1260,7 +1261,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "bytemuck", "cosmic-text", @@ -1277,7 +1278,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.10.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -1297,7 +1298,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "iced_renderer", "iced_runtime", @@ -1311,7 +1312,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.9.1" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/tarkah/iced?rev=d79cedd8da99345947f5b9fcb1ebc3a145cc4112#d79cedd8da99345947f5b9fcb1ebc3a145cc4112" dependencies = [ "iced_graphics", "iced_runtime", diff --git a/Cargo.toml b/Cargo.toml index 665679a57..57b5537dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,5 +31,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" } diff --git a/src/buffer/channel.rs b/src/buffer/channel.rs index 5a606a26a..292e67f16 100644 --- a/src/buffer/channel.rs +++ b/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) diff --git a/src/buffer/scroll_view.rs b/src/buffer/scroll_view.rs index 86eec37b0..6a5bf8723 100644 --- a/src/buffer/scroll_view.rs +++ b/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, diff --git a/src/screen/dashboard/side_menu.rs b/src/screen/dashboard/side_menu.rs index 03976f1ff..784ba82c6 100644 --- a/src/screen/dashboard/side_menu.rs +++ b/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() diff --git a/src/widget/selectable_text.rs b/src/widget/selectable_text.rs index 0fc32d0ed..ffee88c4b 100644 --- a/src/widget/selectable_text.rs +++ b/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, From 1bed272046eddb3255cfb274283b5ef1ddfbeb1b Mon Sep 17 00:00:00 2001 From: Cory Forsstrom Date: Tue, 4 Jul 2023 10:59:59 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 736c17ea2..7472f93b4 100644 --- a/CHANGELOG.md +++ b/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: