From fbf2f40d909a537b9c6e58926f03f648041d2c01 Mon Sep 17 00:00:00 2001 From: Jiayi Zhao Date: Sat, 2 Mar 2019 11:36:24 -0500 Subject: make sure preview panel reloads upon certain commands --- src/commands/delete_files.rs | 3 +++ src/commands/tab_operations.rs | 4 +++- src/commands/tab_switch.rs | 7 ++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/commands/delete_files.rs b/src/commands/delete_files.rs index 3823f57..9a3caed 100644 --- a/src/commands/delete_files.rs +++ b/src/commands/delete_files.rs @@ -4,6 +4,7 @@ use std::path; use crate::commands::{self, JoshutoCommand, JoshutoRunnable}; use crate::config::keymap; use crate::context::JoshutoContext; +use crate::preview; use crate::ui; #[derive(Clone, Debug)] @@ -78,6 +79,8 @@ impl JoshutoRunnable for DeleteFiles { context.config_t.tilde_in_titlebar, ); } + let curr_tab = &mut context.tabs[context.curr_tab_index]; + preview::preview_file(curr_tab, &context.views, &context.config_t); ncurses::doupdate(); } } diff --git a/src/commands/tab_operations.rs b/src/commands/tab_operations.rs index 91cddd5..e4081b7 100644 --- a/src/commands/tab_operations.rs +++ b/src/commands/tab_operations.rs @@ -51,6 +51,7 @@ impl std::fmt::Display for NewTab { impl JoshutoRunnable for NewTab { fn execute(&self, context: &mut JoshutoContext) { Self::new_tab(context); + ncurses::doupdate(); } } @@ -71,7 +72,7 @@ impl CloseTab { return; } - context.tabs.remove(context.curr_tab_index); + let _ = context.tabs.remove(context.curr_tab_index); if context.curr_tab_index > 0 { context.curr_tab_index -= 1; } @@ -90,5 +91,6 @@ impl std::fmt::Display for CloseTab { impl JoshutoRunnable for CloseTab { fn execute(&self, context: &mut JoshutoContext) { Self::close_tab(context); + ncurses::doupdate(); } } diff --git a/src/commands/tab_switch.rs b/src/commands/tab_switch.rs index cf5131b..2929bd2 100644 --- a/src/commands/tab_switch.rs +++ b/src/commands/tab_switch.rs @@ -1,5 +1,6 @@ use crate::commands::{JoshutoCommand, JoshutoRunnable}; use crate::context::JoshutoContext; +use crate::preview; use crate::ui; #[derive(Clone, Debug)] @@ -27,10 +28,9 @@ impl TabSwitch { &context.hostname, ); } - ui::redraw_tab_view(&context.views.tab_win, &context); - - ncurses::doupdate(); + let curr_tab = &mut context.tabs[context.curr_tab_index]; + preview::preview_file(curr_tab, &context.views, &context.config_t); } } @@ -53,5 +53,6 @@ impl JoshutoRunnable for TabSwitch { new_index -= tab_len; } Self::tab_switch(new_index, context); + ncurses::doupdate(); } } -- cgit v1.2.3