Statusbar only needs nerdfont config

This commit is contained in:
Michael Edwards
2019-03-27 22:36:02 +01:00
committed by Henrik Friedrichsen
parent d7848ec333
commit dc88f7e3ee
2 changed files with 7 additions and 4 deletions

View File

@@ -166,7 +166,11 @@ fn main() {
let queueview = ui::queue::QueueView::new(queue.clone(), playlists.clone()); let queueview = ui::queue::QueueView::new(queue.clone(), playlists.clone());
let status = ui::statusbar::StatusBar::new(queue.clone(), spotify.clone(), &cfg); let status = ui::statusbar::StatusBar::new(
queue.clone(),
spotify.clone(),
cfg.use_nerdfont.unwrap_or(false),
);
let mut layout = ui::layout::Layout::new(status, &event_manager, theme) let mut layout = ui::layout::Layout::new(status, &event_manager, theme)
.view("search", search.with_id("search"), "Search") .view("search", search.with_id("search"), "Search")

View File

@@ -8,7 +8,6 @@ use cursive::vec::Vec2;
use cursive::Printer; use cursive::Printer;
use unicode_width::UnicodeWidthStr; use unicode_width::UnicodeWidthStr;
use config::Config;
use queue::{Queue, RepeatSetting}; use queue::{Queue, RepeatSetting};
use spotify::{PlayerEvent, Spotify}; use spotify::{PlayerEvent, Spotify};
@@ -20,12 +19,12 @@ pub struct StatusBar {
} }
impl StatusBar { impl StatusBar {
pub fn new(queue: Arc<Queue>, spotify: Arc<Spotify>, cfg: &Config) -> StatusBar { pub fn new(queue: Arc<Queue>, spotify: Arc<Spotify>, use_nerdfont: bool) -> StatusBar {
StatusBar { StatusBar {
queue, queue,
spotify, spotify,
last_size: Vec2::new(0, 0), last_size: Vec2::new(0, 0),
use_nerdfont: cfg.use_nerdfont.unwrap_or(false), use_nerdfont,
} }
} }
} }