From 976ea0282d373c4d08187a78a7b46a09d66f7918 Mon Sep 17 00:00:00 2001 From: nc Date: Wed, 5 Aug 2020 23:56:06 -0400 Subject: revert --- src/app/impl_view.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/app/impl_view.rs') diff --git a/src/app/impl_view.rs b/src/app/impl_view.rs index 1261208..892b00c 100644 --- a/src/app/impl_view.rs +++ b/src/app/impl_view.rs @@ -39,8 +39,8 @@ impl View for App { printer.print(offset, &status.1); // right status offset = offset.map_x(|_| 0).map_y(|_| self.max_size().y - 1); - printer.with_style(Color::from(self.message.read().unwrap().kind()), |p| { - p.print(offset, self.message.read().unwrap().contents()) + printer.with_style(Color::from(self.message.kind()), |p| { + p.print(offset, self.message.contents()) }); } @@ -85,7 +85,6 @@ impl View for App { if self.habits.is_empty() { return EventResult::Ignored; } - let m = self.message.clone(); match e { Event::Key(Key::Right) | Event::Key(Key::Tab) | Event::Char('l') => { self.set_focus(Absolute::Right); @@ -162,12 +161,8 @@ impl View for App { return EventResult::Consumed(None); } Event::CtrlChar('l') => { - self.message.write().unwrap().clear(); - self.message.write().unwrap().set_kind(MessageKind::Info); - return EventResult::Consumed(None); - } - Event::CtrlChar('c') => { - m.write().unwrap().set_message("Use the :q command to quit"); + self.message.clear(); + self.message.set_kind(MessageKind::Info); return EventResult::Consumed(None); } -- cgit v1.2.3