From 63cfcbe7a7745b276de58ec92e0141b958c44feb Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Sat, 10 Aug 2024 19:06:46 +0200 Subject: use unsafe blocks instead of mutexes --- src/widgets/sheetview/mod.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/widgets/sheetview') diff --git a/src/widgets/sheetview/mod.rs b/src/widgets/sheetview/mod.rs index fe2aa5a..9b6b5bd 100644 --- a/src/widgets/sheetview/mod.rs +++ b/src/widgets/sheetview/mod.rs @@ -33,7 +33,7 @@ impl SheetView { } pub fn handle_key_event(&mut self, event: KeyEvent) { - let mode = { GlobalState::instance().view.mode }; + let mode = { GlobalState::get().view.mode }; match mode { Mode::Command => match event.code { KeyCode::Enter => { @@ -41,11 +41,11 @@ impl SheetView { // TODO: push errors to buffer } - GlobalState::instance_mut().view.cancel_mode(); + GlobalState::get().view.cancel_mode(); self.bar.set_input_mode(false); } KeyCode::Esc => { - GlobalState::instance_mut().view.cancel_mode(); + GlobalState::get().view.cancel_mode(); self.bar.set_input_mode(false); } _ => self.bar.handle_keyevent(event), @@ -53,7 +53,7 @@ impl SheetView { _ => { ViewKeyMap::handle(event); - let mode = { GlobalState::instance().view.mode }; + let mode = { GlobalState::get().view.mode }; if let Mode::Command = mode { self.bar.set_input_mode(true) } @@ -68,11 +68,10 @@ impl Widget for &mut SheetView { Self: Sized, { let mode = { - let theme = GlobalConfig::instance().theme.view.clone(); + let theme = GlobalConfig::get().theme.view.clone(); - let state = GlobalState::instance(); - let lock = state.view.active_sheet().unwrap(); - let sheet = lock.read().unwrap(); + let state = GlobalState::get(); + let sheet = state.view.active_sheet().unwrap(); let cursor = &state.view.cursor; let sheet_area_inner = self.bar.area(area); -- cgit v1.2.3-70-g09d2