From 857f7973e3ca505178f31ec7cd0e2041efb90399 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 21 Nov 2025 22:53:33 +0800 Subject: [PATCH] scrollbar: Remove `Scrollbar::uniform_scroll`, use `Scrollbar::vertical` instead. (#1659) ## Break Change - Remove `Scrollbar::uniform_scroll`, use `Scrollbar::vertical` instead. ```diff - Scrollbar::uniform_scroll(&scroll_state, &scroll_handle) + Scrollbar::vertical(&scroll_state, &scroll_handle) ``` --- crates/ui/src/list/list.rs | 2 +- crates/ui/src/scroll/scrollbar.rs | 8 -------- crates/ui/src/table/state.rs | 7 ++----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/crates/ui/src/list/list.rs b/crates/ui/src/list/list.rs index 9c0ea580..3f390e3b 100644 --- a/crates/ui/src/list/list.rs +++ b/crates/ui/src/list/list.rs @@ -550,7 +550,7 @@ where } }) .when(scrollbar_visible, |this| { - this.child(Scrollbar::uniform_scroll(&scroll_state, &scroll_handle)) + this.child(Scrollbar::vertical(&scroll_state, &scroll_handle)) }) } } diff --git a/crates/ui/src/scroll/scrollbar.rs b/crates/ui/src/scroll/scrollbar.rs index bbfb985f..de427b1b 100644 --- a/crates/ui/src/scroll/scrollbar.rs +++ b/crates/ui/src/scroll/scrollbar.rs @@ -359,14 +359,6 @@ impl Scrollbar { Self::new(ScrollbarAxis::Vertical, state, scroll_handle) } - /// Create vertical scrollbar for uniform list. - pub fn uniform_scroll( - state: &ScrollbarState, - scroll_handle: &(impl ScrollHandleOffsetable + Clone + 'static), - ) -> Self { - Self::new(ScrollbarAxis::Vertical, state, scroll_handle) - } - /// Set the scrollbar show mode [`ScrollbarShow`], if not set use the `cx.theme().scrollbar_show`. pub fn scrollbar_show(mut self, scrollbar_show: ScrollbarShow) -> Self { self.scrollbar_show = Some(scrollbar_show); diff --git a/crates/ui/src/table/state.rs b/crates/ui/src/table/state.rs index 960eac2a..456b8112 100644 --- a/crates/ui/src/table/state.rs +++ b/crates/ui/src/table/state.rs @@ -1214,11 +1214,8 @@ where .bottom_0() .w(Scrollbar::width()) .child( - Scrollbar::uniform_scroll( - &self.vertical_scroll_state, - &self.vertical_scroll_handle, - ) - .max_fps(60), + Scrollbar::vertical(&self.vertical_scroll_state, &self.vertical_scroll_handle) + .max_fps(60), ), ) }