From e7304fa8de65babd494b03c2ca2952e1e18fcc45 Mon Sep 17 00:00:00 2001 From: Jiayi Zhao Date: Tue, 8 Jan 2019 19:50:17 -0500 Subject: fix tab view not redrawing when resizing --- src/joshuto.rs | 8 ++++---- src/joshuto/window.rs | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/joshuto.rs b/src/joshuto.rs index 737bbc6..aa32590 100644 --- a/src/joshuto.rs +++ b/src/joshuto.rs @@ -67,10 +67,8 @@ impl JoshutoTab { Some(dirent) => { if dirent.path.is_dir() { preview_view = match history.pop_or_create(&dirent.path, sort_type) { - Ok(s) => { Some(s) }, - Err(e) => { - None - }, + Ok(s) => Some(s), + Err(_) => None, }; } else { preview_view = None; @@ -238,6 +236,8 @@ pub fn resize_handler(context: &mut JoshutoContext) ui::redraw_status(&context.views, curr_list, curr_path, &context.username, &context.hostname); + ui::redraw_tab_view(&context.views.tab_win, &context); + ncurses::doupdate(); } diff --git a/src/joshuto/window.rs b/src/joshuto/window.rs index ccf6f63..23deac5 100644 --- a/src/joshuto/window.rs +++ b/src/joshuto/window.rs @@ -137,10 +137,14 @@ impl JoshutoView { ncurses::getmaxyx(ncurses::stdscr(), &mut term_rows, &mut term_cols); let term_divide: i32 = term_cols / sum_ratio as i32; - let win_xy: (i32, i32) = (1, term_cols); + let win_xy: (i32, i32) = (1, term_cols - 5); let win_coord: (usize, usize) = (0, 0); self.top_win.redraw(win_xy.0, win_xy.1, win_coord); + let win_xy: (i32, i32) = (1, 5); + let win_coord: (usize, usize) = (0, term_cols as usize - 5); + self.tab_win.redraw(win_xy.0, win_xy.1, win_coord); + let win_xy: (i32, i32) = (term_rows - 2, (term_divide * self.win_ratio.0 as i32) - 2); let win_coord: (usize, usize) = (1, 0); self.left_win.redraw(win_xy.0, win_xy.1, win_coord); -- cgit v1.2.3