From bb9944d086332ed0b8d6064316225e901c456bd7 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Fri, 2 Aug 2024 21:34:41 +0200 Subject: change 'viewsheet' bindings to 'view' --- src/state/mod.rs | 6 +++--- src/state/view/bar.rs | 4 ++-- src/state/view/mod.rs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/state') diff --git a/src/state/mod.rs b/src/state/mod.rs index a461d58..3b5d3c5 100644 --- a/src/state/mod.rs +++ b/src/state/mod.rs @@ -12,7 +12,7 @@ mod bar; #[derive(Debug, Default)] pub struct GlobalState { - pub sheetview: view::SheetViewState, + pub view: view::SheetViewState, pub editor: editor::EditorState, pub active_window: window::Window, pub log: log::LogState, @@ -24,7 +24,7 @@ const DUMMY_STATE: GlobalState = GlobalState::new(); impl GlobalState { const fn new() -> Self { Self { - sheetview: view::SheetViewState::new(), + view: view::SheetViewState::new(), editor: editor::EditorState::new(), log: LogState::new(), active_window: window::Window::View, @@ -52,7 +52,7 @@ impl GlobalState { impl UserData for GlobalState { fn add_fields<'lua, F: UserDataFields<'lua, Self>>(fields: &mut F) { - fields.add_field_function_get("view", |_, _| Ok(DUMMY_STATE.sheetview)); + fields.add_field_function_get("view", |_, _| Ok(DUMMY_STATE.view)); fields.add_field_function_get("editor", |_, _| Ok(DUMMY_STATE.editor)); fields.add_field_function_get("active_window", |_, _| { Ok(GlobalState::instance().active_window) diff --git a/src/state/view/bar.rs b/src/state/view/bar.rs index f3d1e46..57898f5 100644 --- a/src/state/view/bar.rs +++ b/src/state/view/bar.rs @@ -5,6 +5,6 @@ use super::mode::Mode; BarState!( SheetViewBarState, Mode, - GlobalState::instance().sheetview.bar, - GlobalState::instance_mut().sheetview.bar + GlobalState::instance().view.bar, + GlobalState::instance_mut().view.bar ); diff --git a/src/state/view/mod.rs b/src/state/view/mod.rs index 1825128..a63b6ed 100644 --- a/src/state/view/mod.rs +++ b/src/state/view/mod.rs @@ -121,13 +121,13 @@ impl SheetViewState { macro_rules! cfg { () => { - GlobalState::instance().sheetview + GlobalState::instance().view }; } macro_rules! cfg_mut { () => { - GlobalState::instance_mut().sheetview + GlobalState::instance_mut().view }; } @@ -173,7 +173,7 @@ impl UserData for SheetViewState { }); fields.add_field_function_get("bar", |_, _| { - Ok(DUMMY_STATE.sheetview.bar) + Ok(DUMMY_STATE.view.bar) }) } -- cgit v1.2.3-70-g09d2