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

update to cursive 0.14.0

Browse Source
This commit is contained in:
Henrik Friedrichsen
2020-02-02 19:55:26 +01:00
parent e9bf33a3d5
commit 2039878144
6 changed files with 65 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/contextmenu.rs
View File

@@ -1,6 +1,6 @@
use std::sync::Arc;
use cursive::view::ViewWrapper;
use cursive::view::{Margins, ViewWrapper};
use cursive::views::{Dialog, ScrollView, SelectView};
use cursive::Cursive;
@@ -39,7 +39,7 @@ impl ContextMenu {
let dialog = Dialog::new()
.title("Add track to playlist")
.dismiss_button("Cancel")
.padding((1, 1, 1, 0))
.padding(Margins::lrtb(1, 1, 1, 0))
.content(ScrollView::new(list_select));
Modal::new(dialog)
}
@@ -91,7 +91,7 @@ impl ContextMenu {
let dialog = Dialog::new()
.title(item.display_left())
.dismiss_button("Cancel")
.padding((1, 1, 1, 0))
.padding(Margins::lrtb(1, 1, 1, 0))
.content(content);
Self {
dialog: Modal::new(dialog),

4
src/ui/playlists.rs
View File

@@ -1,6 +1,6 @@
use std::sync::Arc;
use cursive::view::ViewWrapper;
use cursive::view::{Margins, ViewWrapper};
use cursive::views::Dialog;
use cursive::Cursive;
@@ -34,7 +34,7 @@ impl PlaylistsView {
let library = self.library.clone();
let id = playlist.id.clone();
let dialog = Dialog::text("Are you sure you want to delete this playlist?")
.padding((1, 1, 1, 0))
.padding(Margins::lrtb(1, 1, 1, 0))
.title("Delete playlist")
.dismiss_button("No")
.button("Yes", move |s: &mut Cursive| {

6
src/ui/queue.rs
View File

@@ -1,5 +1,5 @@
use cursive::traits::{Boxable, Identifiable};
use cursive::view::ViewWrapper;
use cursive::view::{Margins, ViewWrapper};
use cursive::views::{Dialog, EditView, ScrollView, SelectView};
use cursive::Cursive;
@@ -56,7 +56,7 @@ impl QueueView {
let dialog = Dialog::new()
.title("Enter name")
.dismiss_button("Cancel")
.padding((1, 1, 1, 0))
.padding(Margins::lrtb(1, 1, 1, 0))
.content(edit);
s.add_layer(Modal::new(dialog));
}
@@ -78,7 +78,7 @@ impl QueueView {
let dialog = Dialog::new()
.title("Create new or overwrite existing playlist?")
.dismiss_button("Cancel")
.padding((1, 1, 1, 0))
.padding(Margins::lrtb(1, 1, 1, 0))
.content(ScrollView::new(list_select));
Modal::new(dialog)
}

4
src/ui/search.rs
View File

@@ -421,8 +421,8 @@ impl View for SearchView {
}
fn call_on_any<'a>(&mut self, selector: &Selector<'_>, mut callback: AnyCb<'a>) {
self.edit.call_on_any(selector, Box::new(|v| callback(v)));
self.tabs.call_on_any(selector, Box::new(|v| callback(v)));
self.edit.call_on_any(selector, &mut |v| callback(v));
self.tabs.call_on_any(selector, &mut |v| callback(v));
}
fn focus_view(&mut self, selector: &Selector<'_>) -> Result<(), ()> {