From eaa7a5a24c4359ebeaab507855388942e8984d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <150025636+git-f0x@users.noreply.github.com> Date: Fri, 18 Sep 2026 21:04:54 +0200 Subject: [PATCH] chore: update iced Adapts to scrollable changes --- iced | 2 +- src/widget/scrollable/scrollable.rs | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/iced b/iced index 5fc4372d..5e2b5807 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit 5fc4372d877ad2ca6eaab1c0ca5e424f238b9258 +Subproject commit 5e2b580791e994cb0132c94b32ba4b00bc9ced21 diff --git a/src/widget/scrollable/scrollable.rs b/src/widget/scrollable/scrollable.rs index a3fa4edd..6565279f 100644 --- a/src/widget/scrollable/scrollable.rs +++ b/src/widget/scrollable/scrollable.rs @@ -2,30 +2,28 @@ // SPDX-License-Identifier: MPL-2.0 use crate::{Element, Renderer}; -use iced::widget; +use iced::widget::scrollable::{Direction, Scrollable, Scrollbar}; pub fn scrollable<'a, Message>( element: impl Into>, -) -> widget::Scrollable<'a, Message, crate::Theme, Renderer> { +) -> Scrollable<'a, Message, crate::Theme, Renderer> { vertical(element) } pub fn vertical<'a, Message>( element: impl Into>, -) -> widget::Scrollable<'a, Message, crate::Theme, Renderer> { - widget::scrollable(element) - .scroller_width(8.0) - .scrollbar_width(8.0) - .scrollbar_padding(8.0) +) -> Scrollable<'a, Message, crate::Theme, Renderer> { + iced::widget::scrollable(element) + .padding(8.0) + .direction(Direction::Vertical( + Scrollbar::new().width(8.0).scroller_width(8.0), + )) } pub fn horizontal<'a, Message>( element: impl Into>, -) -> widget::Scrollable<'a, Message, crate::Theme, Renderer> { - widget::scrollable(element) - .direction(widget::scrollable::Direction::Horizontal( - widget::scrollable::Scrollbar::new(), - )) - .scroller_width(8.0) - .scrollbar_width(8.0) +) -> Scrollable<'a, Message, crate::Theme, Renderer> { + iced::widget::scrollable(element).direction(Direction::Horizontal( + Scrollbar::new().width(8.0).scroller_width(8.0), + )) }