From dc88f7e3eed5c483a3a7b2ea5afa0ba2ff7d0111 Mon Sep 17 00:00:00 2001 From: Michael Edwards Date: Wed, 27 Mar 2019 22:36:02 +0100 Subject: [PATCH] Statusbar only needs nerdfont config --- src/main.rs | 6 +++++- src/ui/statusbar.rs | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index 831647f..d486ce7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -166,7 +166,11 @@ fn main() { 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) .view("search", search.with_id("search"), "Search") diff --git a/src/ui/statusbar.rs b/src/ui/statusbar.rs index c5f3484..fe291a2 100644 --- a/src/ui/statusbar.rs +++ b/src/ui/statusbar.rs @@ -8,7 +8,6 @@ use cursive::vec::Vec2; use cursive::Printer; use unicode_width::UnicodeWidthStr; -use config::Config; use queue::{Queue, RepeatSetting}; use spotify::{PlayerEvent, Spotify}; @@ -20,12 +19,12 @@ pub struct StatusBar { } impl StatusBar { - pub fn new(queue: Arc, spotify: Arc, cfg: &Config) -> StatusBar { + pub fn new(queue: Arc, spotify: Arc, use_nerdfont: bool) -> StatusBar { StatusBar { queue, spotify, last_size: Vec2::new(0, 0), - use_nerdfont: cfg.use_nerdfont.unwrap_or(false), + use_nerdfont, } } }