lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add CommandResult for modal views

Browse Source
This commit is contained in:
Henrik Friedrichsen
2019-06-09 23:55:12 +02:00
parent 298091c301
commit b59e9b38e6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/commands.rs
View File

@@ -6,6 +6,7 @@ use command::{
Command, GotoMode, MoveMode, PlaylistCommands, SeekDirection, ShiftMode, TargetMode, Command, GotoMode, MoveMode, PlaylistCommands, SeekDirection, ShiftMode, TargetMode,
}; };
use cursive::event::{Event, Key}; use cursive::event::{Event, Key};
use cursive::traits::View;
use cursive::views::ViewRef; use cursive::views::ViewRef;
use cursive::Cursive; use cursive::Cursive;
use library::Library; use library::Library;
@@ -17,6 +18,7 @@ use ui::layout::Layout;
pub enum CommandResult { pub enum CommandResult {
Consumed(Option<String>), Consumed(Option<String>),
View(Box<dyn ViewExt>), View(Box<dyn ViewExt>),
Modal(Box<dyn View>),
Ignored, Ignored,
} }
@@ -134,6 +136,9 @@ impl CommandManager {
if let CommandResult::Consumed(output) = local { if let CommandResult::Consumed(output) = local {
Ok(output) Ok(output)
} else if let CommandResult::Modal(modal) = local {
s.add_layer(modal);
Ok(None)
} else if let CommandResult::View(view) = local { } else if let CommandResult::View(view) = local {
s.call_on_id("main", move |v: &mut Layout| { s.call_on_id("main", move |v: &mut Layout| {
v.push_view(view); v.push_view(view);