From a136e70c258a01d2acd4466ba292435b13d13183 Mon Sep 17 00:00:00 2001 From: ejaszczuk Date: Tue, 10 Nov 2020 21:16:15 +0100 Subject: [PATCH 1/2] Add scrollbar in branchlist --- src/components/select_branch.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/select_branch.rs b/src/components/select_branch.rs index 297aab5c9c..0995cfde82 100644 --- a/src/components/select_branch.rs +++ b/src/components/select_branch.rs @@ -78,12 +78,20 @@ impl DrawableComponent for SelectBranchComponent { .block( Block::default() .title(strings::SELECT_BRANCH_POPUP_MSG) - .borders(Borders::ALL) - .border_type(BorderType::Thick), + .border_type(BorderType::Thick) + .borders(Borders::ALL), ) .alignment(Alignment::Left), area, ); + + ui::draw_scrollbar( + f, + area, + &self.theme, + self.branch_names.len(), + self.scroll_top.get(), + ); } Ok(()) From b44f1f7d56e715844a0ae3ff4a29753dfaa851b7 Mon Sep 17 00:00:00 2001 From: ejaszczuk Date: Thu, 12 Nov 2020 14:15:30 +0100 Subject: [PATCH 2/2] Change scrollbar symbol to DOUBLE_VERTICAL --- src/ui/scrollbar.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/scrollbar.rs b/src/ui/scrollbar.rs index 5cd63bd472..73f2ab9b10 100644 --- a/src/ui/scrollbar.rs +++ b/src/ui/scrollbar.rs @@ -5,7 +5,7 @@ use tui::{ buffer::Buffer, layout::{Margin, Rect}, style::Style, - symbols::{block::FULL, line::THICK_VERTICAL}, + symbols::{block::FULL, line::DOUBLE_VERTICAL}, widgets::Widget, Frame, }; @@ -50,7 +50,7 @@ impl Widget for Scrollbar { } for y in area.top()..area.bottom() { - buf.set_string(right, y, THICK_VERTICAL, self.style_bar); + buf.set_string(right, y, DOUBLE_VERTICAL, self.style_bar); } let max_pos = self.lines.saturating_sub(area.height);