From e2c99d7e309fce4f0907c1e63662e565f768f011 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Thu, 29 Aug 2024 22:12:18 +0200 Subject: [PATCH] lib: Fix table widget scrollbar in imUI --- src/ui/im.rs | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/ui/im.rs b/src/ui/im.rs index 86b8004a..60db5fff 100644 --- a/src/ui/im.rs +++ b/src/ui/im.rs @@ -857,25 +857,26 @@ pub mod widget { frame.render_stateful_widget(table, table_area, &mut state.internal); - let scroller = Scrollbar::default() - .begin_symbol(None) - .track_symbol(None) - .end_symbol(None) - .thumb_symbol("┃") - .style(if has_focus { - Style::default() - } else { - Style::default().dim() - }); + if show_scrollbar { + let content_length = self.items.len(); + let scroller = Scrollbar::default() + .begin_symbol(None) + .track_symbol(None) + .end_symbol(None) + .thumb_symbol("┃") + .style(if has_focus { + Style::default() + } else { + Style::default().dim() + }); - let content_length = self.items.len(); + let mut state = ScrollbarState::default() + .content_length(content_length) + .viewport_content_length(1) + .position(state.internal.offset()); - let mut scroller_state = ScrollbarState::default() - .content_length(content_length) - .viewport_content_length(1) - .position(state.internal.offset()); - - frame.render_stateful_widget(scroller, scroller_area, &mut scroller_state); + frame.render_stateful_widget(scroller, scroller_area, &mut state); + } } else { let center = layout::centered_rect(area, 50, 10); let hint = Text::from(span::default("Nothing to show"))