summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorJeff Zhao <jeff.no.zhao@gmail.com>2021-05-01 09:57:58 -0400
committerJeff Zhao <jeff.no.zhao@gmail.com>2021-05-01 10:00:45 -0400
commit4409199315c5cc22bfba6cc63052a49dbdddfeb1 (patch)
treecfda2851a0c01cd183643810a6fe0941129f103a /src/ui
parent297a06ef3a529687e7edb84d5f67376c654b1927 (diff)
remove methods
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/views/tui_folder_view.rs21
-rw-r--r--src/ui/views/tui_textfield.rs7
-rw-r--r--src/ui/widgets/tui_topbar.rs7
3 files changed, 20 insertions, 15 deletions
diff --git a/src/ui/views/tui_folder_view.rs b/src/ui/views/tui_folder_view.rs
index 24aa36f..3705bd8 100644
--- a/src/ui/views/tui_folder_view.rs
+++ b/src/ui/views/tui_folder_view.rs
@@ -31,17 +31,18 @@ impl<'a> Widget for TuiFolderView<'a> {
let parent_list = curr_tab.parent_list_ref();
let child_list = curr_tab.child_list_ref();
- let constraints: &[Constraint; 3] =
- if !self.context.display_options_ref().collapse_preview() {
- &self.context.display_options_ref().default_layout
- } else {
- match child_list {
- Some(_) => &self.context.display_options_ref().default_layout,
- None => &self.context.display_options_ref().no_preview_layout,
- }
- };
+ let config = self.context.config_ref();
+
+ let constraints: &[Constraint; 3] = if !config.display_options_ref().collapse_preview() {
+ &config.display_options_ref().default_layout
+ } else {
+ match child_list {
+ Some(_) => &config.display_options_ref().default_layout,
+ None => &config.display_options_ref().no_preview_layout,
+ }
+ };
- let layout_rect = if self.context.display_options_ref().show_borders() {
+ let layout_rect = if config.display_options_ref().show_borders() {
let area = Rect {
y: area.top() + 1,
height: area.height - 2,
diff --git a/src/ui/views/tui_textfield.rs b/src/ui/views/tui_textfield.rs
index 43d8f4d..701bf20 100644
--- a/src/ui/views/tui_textfield.rs
+++ b/src/ui/views/tui_textfield.rs
@@ -84,8 +84,7 @@ impl<'a> TuiTextField<'a> {
line_buffer.set_pos(char_idx);
let terminal = backend.terminal_mut();
-
- terminal.show_cursor();
+ let _ = terminal.show_cursor();
loop {
terminal
@@ -190,7 +189,7 @@ impl<'a> TuiTextField<'a> {
Key::Up => {}
Key::Down => {}
Key::Esc => {
- terminal.hide_cursor();
+ let _ = terminal.hide_cursor();
return None;
}
Key::Char('\t') => {
@@ -243,7 +242,7 @@ impl<'a> TuiTextField<'a> {
};
}
}
- terminal.hide_cursor();
+ let _ = terminal.hide_cursor();
if line_buffer.as_str().is_empty() {
None
diff --git a/src/ui/widgets/tui_topbar.rs b/src/ui/widgets/tui_topbar.rs
index aef32ed..a73c911 100644
--- a/src/ui/widgets/tui_topbar.rs
+++ b/src/ui/widgets/tui_topbar.rs
@@ -42,7 +42,12 @@ impl<'a> Widget for TuiTopBar<'a> {
None => {}
}
}
- if self.context.display_options_ref().tilde_in_titlebar() {
+ if self
+ .context
+ .config_ref()
+ .display_options_ref()
+ .tilde_in_titlebar()
+ {
if let Some(home_dir) = HOME_DIR.as_ref() {
let home_dir_str = home_dir.to_string_lossy().into_owned();
curr_path_str = curr_path_str.replace(&home_dir_str, "~");