diff options
-rw-r--r-- | src/config/general/display_raw.rs | 2 | ||||
-rw-r--r-- | src/config/option/display_option.rs | 2 | ||||
-rw-r--r-- | src/main.rs | 2 | ||||
-rw-r--r-- | src/ui/views/mod.rs | 12 | ||||
-rw-r--r-- | src/ui/views/tui_hsplit_view.rs (renamed from src/ui/views/tui_vsplit_view.rs) | 6 | ||||
-rw-r--r-- | src/ui/views/tui_textfield.rs | 5 | ||||
-rw-r--r-- | src/ui/views/tui_view.rs | 7 |
7 files changed, 18 insertions, 18 deletions
diff --git a/src/config/general/display_raw.rs b/src/config/general/display_raw.rs index 0ea7a78..de91ea2 100644 --- a/src/config/general/display_raw.rs +++ b/src/config/general/display_raw.rs @@ -80,7 +80,7 @@ impl std::default::Default for DisplayOptionRaw { impl From<DisplayOptionRaw> for DisplayOption { fn from(raw: DisplayOptionRaw) -> Self { let mode = match raw.mode.as_str() { - "vsplit" => DisplayMode::VSplit, + "hsplit" => DisplayMode::HSplit, _ => DisplayMode::Default, }; diff --git a/src/config/option/display_option.rs b/src/config/option/display_option.rs index c8c4d01..5166725 100644 --- a/src/config/option/display_option.rs +++ b/src/config/option/display_option.rs @@ -7,7 +7,7 @@ use crate::config::option::SortOption; #[derive(Clone, Copy, Debug)] pub enum DisplayMode { Default, - VSplit, + HSplit, } pub const fn default_column_ratio() -> (usize, usize, usize) { diff --git a/src/main.rs b/src/main.rs index 0223fc2..d809b58 100644 --- a/src/main.rs +++ b/src/main.rs @@ -54,7 +54,7 @@ lazy_static! { if let Ok(p) = std::env::var("HOME") { let mut p = PathBuf::from(p); - p.push(".config/joshuto"); + p.push(format!(".config/{}", PROGRAM_NAME)); if p.is_dir() { config_dirs.push(p); } diff --git a/src/ui/views/mod.rs b/src/ui/views/mod.rs index 645694b..7eac325 100644 --- a/src/ui/views/mod.rs +++ b/src/ui/views/mod.rs @@ -1,13 +1,13 @@ mod tui_command_menu; mod tui_folder_view; +mod tui_hsplit_view; mod tui_textfield; mod tui_view; -mod tui_vsplit_view; mod tui_worker_view; -pub use self::tui_command_menu::TuiCommandMenu; +pub use self::tui_command_menu::*; pub use self::tui_folder_view::*; -pub use self::tui_textfield::TuiTextField; -pub use self::tui_view::TuiView; -pub use self::tui_vsplit_view::*; -pub use self::tui_worker_view::TuiWorkerView; +pub use self::tui_hsplit_view::*; +pub use self::tui_textfield::*; +pub use self::tui_view::*; +pub use self::tui_worker_view::*; diff --git a/src/ui/views/tui_vsplit_view.rs b/src/ui/views/tui_hsplit_view.rs index e6b0a7d..015ca5a 100644 --- a/src/ui/views/tui_vsplit_view.rs +++ b/src/ui/views/tui_hsplit_view.rs @@ -9,12 +9,12 @@ use crate::ui::widgets::{TuiDirListDetailed, TuiFooter, TuiTabBar, TuiTopBar}; const TAB_VIEW_WIDTH: u16 = 15; -pub struct TuiVSplitView<'a> { +pub struct TuiHSplitView<'a> { pub context: &'a AppContext, pub show_bottom_status: bool, } -impl<'a> TuiVSplitView<'a> { +impl<'a> TuiHSplitView<'a> { pub fn new(context: &'a AppContext) -> Self { Self { context, @@ -23,7 +23,7 @@ impl<'a> TuiVSplitView<'a> { } } -impl<'a> Widget for TuiVSplitView<'a> { +impl<'a> Widget for TuiHSplitView<'a> { fn render(self, area: Rect, buf: &mut Buffer) { let tab_context = self.context.tab_context_ref(); let tab_index = tab_context.index; diff --git a/src/ui/views/tui_textfield.rs b/src/ui/views/tui_textfield.rs index 7cb4369..045def9 100644 --- a/src/ui/views/tui_textfield.rs +++ b/src/ui/views/tui_textfield.rs @@ -86,8 +86,8 @@ impl<'a> TuiTextField<'a> { let char_idx = self._prefix.chars().map(|c| c.len_utf8()).sum(); - line_buffer.insert_str(0, self._suffix); line_buffer.insert_str(0, self._prefix); + line_buffer.insert_str(line_buffer.len(), self._suffix); line_buffer.set_pos(char_idx); let terminal = backend.terminal_mut(); @@ -102,6 +102,7 @@ impl<'a> TuiTextField<'a> { if area.height == 0 { return; } + // redraw view { let mut view = TuiView::new(context); view.show_bottom_status = false; @@ -117,7 +118,7 @@ impl<'a> TuiTextField<'a> { let multiline_height = multiline.height(); // render menu - { + if !self._menu_items.is_empty() { let menu_widget = TuiMenu::new(self._menu_items.as_slice()); let menu_len = menu_widget.len(); let menu_y = if menu_len + 1 > area.height as usize { diff --git a/src/ui/views/tui_view.rs b/src/ui/views/tui_view.rs index d50c1a6..541ffed 100644 --- a/src/ui/views/tui_view.rs +++ b/src/ui/views/tui_view.rs @@ -2,8 +2,7 @@ use tui::buffer::Buffer; use tui::layout::Rect; use tui::widgets::Widget; -use super::TuiFolderView; -use super::TuiVSplitView; +use crate::ui::views::{TuiFolderView, TuiHSplitView}; use crate::config::option::DisplayMode; use crate::context::AppContext; @@ -29,8 +28,8 @@ impl<'a> Widget for TuiView<'a> { DisplayMode::Default => { TuiFolderView::new(self.context).render(area, buf); } - DisplayMode::VSplit => { - TuiVSplitView::new(self.context).render(area, buf); + DisplayMode::HSplit => { + TuiHSplitView::new(self.context).render(area, buf); } } } |