bobwen-dev/hunter
1
0
Fork 0
mirror of https://github.com/bobwen-dev/hunter synced 2025-04-12 00:55:41 +02:00
Code Issues Releases Wiki Activity

fixed warning about undefined key

Browse Source
This commit is contained in:
rabite 2019-05-22 19:57:36 +02:00
parent d1e9c1645b
commit 6341d02837
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/file_browser.rs
View File

@ -1,4 +1,4 @@
use termion::event::Key; use termion::event::{Event, Key};
use pathbuftools::PathBufTools; use pathbuftools::PathBufTools;
use osstrtools::OsStrTools; use osstrtools::OsStrTools;
use async_value::Stale; use async_value::Stale;
@ -1283,7 +1283,13 @@ impl Widget for FileBrowser {
_ => { _ => {
let main_widget_result = self.main_widget_mut()?.on_key(key); let main_widget_result = self.main_widget_mut()?.on_key(key);
if let Err(HError::WidgetUndefinedKeyError{..}) = main_widget_result { if let Err(HError::WidgetUndefinedKeyError{..}) = main_widget_result {
self.preview_widget_mut()?.on_key(key)?; match self.preview_widget_mut()?.on_key(key) {
Ok(()) => {}
Err(HError::WidgetUndefinedKeyError{key}) => {
self.bad(Event::Key(key))?;
}
err @ Err(_) => { err?; }
}
} }
}, },
} }

4
src/listview.rs
View File

@ -1,4 +1,4 @@
use termion::event::{Event, Key}; use termion::event::Key;
use unicode_width::UnicodeWidthStr; use unicode_width::UnicodeWidthStr;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
@ -90,7 +90,7 @@ impl Listable for ListView<Files> {
Key::Char('N') => self.select_next_mtime(), Key::Char('N') => self.select_next_mtime(),
Key::Char('n') => self.select_prev_mtime(), Key::Char('n') => self.select_prev_mtime(),
Key::Char('d') => self.toggle_dirs_first(), Key::Char('d') => self.toggle_dirs_first(),
_ => { self.bad(Event::Key(key))?; } _ => { HError::undefined_key(key)? }
} }
Ok(()) Ok(())
} }

4
src/mediaview.rs
View File

@ -1,5 +1,5 @@
use lazy_static; use lazy_static;
use termion::event::{Event, Key}; use termion::event::Key;
use crate::widget::{Widget, WidgetCore}; use crate::widget::{Widget, WidgetCore};
use crate::async_value::Stale; use crate::async_value::Stale;
@ -427,7 +427,7 @@ impl Widget for MediaView {
Key::Alt('<') => self.seek_backward(), Key::Alt('<') => self.seek_backward(),
Key::Alt('m') => self.toggle_pause(), Key::Alt('m') => self.toggle_pause(),
Key::Alt('M') => Ok(self.toggle_mute()), Key::Alt('M') => Ok(self.toggle_mute()),
_ => self.bad(Event::Key(key)) _ => HError::undefined_key(key)
} }
} }
} }