4 files changed, 27 insertions, 12 deletions

diff --git a/src/state/bar.rs b/src/state/bar.rs
index 6462449..2f8e6aa 100644
--- a/src/state/bar.rs
+++ b/src/state/bar.rs
@@ -1,15 +1,14 @@
 macro_rules! BarState {
-    ($name:ident, $cfg:expr, $cfg_mut:expr) => {
+    ($name:ident, $type:ty, $cfg:expr, $cfg_mut:expr) => {
         use crate::lua::evalsto::EvalTo;
-        use crate::state::view::mode::Mode;
         use crate::widgets::statusbar::StatusBar;
         use mlua::{Lua, UserData};
 
         #[derive(Debug, Default, Clone)]
         pub struct $name {
-            pub left: EvalTo<String, Mode>,
-            pub middle: EvalTo<String, Mode>,
-            pub right: EvalTo<String, Mode>,
+            pub left: EvalTo<String, $type>,
+            pub middle: EvalTo<String, $type>,
+            pub right: EvalTo<String, $type>,
         }
 
         impl $name {
@@ -21,7 +20,7 @@ macro_rules! BarState {
                 }
             }
 
-            pub fn apply(bar: &mut StatusBar, mode: Mode, lua: &Lua) {
+            pub fn apply(bar: &mut StatusBar, mode: $type, lua: &Lua) {
                 let (left, middle, right) = (
                     $cfg.left.get(mode, lua).unwrap_or_default(),
                     $cfg.middle.get(mode, lua).unwrap_or_default(),
@@ -36,19 +35,19 @@ macro_rules! BarState {
         impl UserData for $name {
             fn add_fields<'lua, F: mlua::prelude::LuaUserDataFields<'lua, Self>>(fields: &mut F) {
                 fields.add_field_function_get("left", |_, _| Ok($cfg.left.clone()));
-                fields.add_field_function_set("left", |_, _, style: EvalTo<String, Mode>| {
+                fields.add_field_function_set("left", |_, _, style: EvalTo<String, $type>| {
                     $cfg_mut.left = style;
                     Ok(())
                 });
 
                 fields.add_field_function_get("middle", |_, _| Ok($cfg.middle.clone()));
-                fields.add_field_function_set("middle", |_, _, style: EvalTo<String, Mode>| {
+                fields.add_field_function_set("middle", |_, _, style: EvalTo<String, $type>| {
                     $cfg_mut.middle = style;
                     Ok(())
                 });
 
                 fields.add_field_function_get("right", |_, _| Ok($cfg.right.clone()));
-                fields.add_field_function_set("right", |_, _, style: EvalTo<String, Mode>| {
+                fields.add_field_function_set("right", |_, _, style: EvalTo<String, $type>| {
                     $cfg_mut.right = style;
                     Ok(())
                 });
diff --git a/src/state/editor/bar.rs b/src/state/editor/bar.rs
new file mode 100644
index 0000000..752d021
--- /dev/null
+++ b/src/state/editor/bar.rs
@@ -0,0 +1,8 @@
+use crate::state::{bar::BarState, GlobalState};
+
+BarState!(
+    EditorBarState,
+    (),
+    GlobalState::instance().editor.bar,
+    GlobalState::instance_mut().editor.bar
+);
diff --git a/src/state/editor/mod.rs b/src/state/editor/mod.rs
index 6fbd2b9..279a164 100644
--- a/src/state/editor/mod.rs
+++ b/src/state/editor/mod.rs
@@ -1,14 +1,16 @@
-use self::buffer::Buffer;
+use self::{bar::EditorBarState, buffer::Buffer};
 
-use super::GlobalState;
+use super::{GlobalState, DUMMY_STATE};
 use mlua::{Lua, UserData};
 
 pub mod buffer;
+pub mod bar;
 
 #[derive(Default, Debug)]
 pub struct EditorState {
     pub visible: bool,
     pub buffer: Buffer,
+    pub bar: EditorBarState,
 }
 
 macro_rules! cfg {
@@ -28,6 +30,7 @@ impl EditorState {
         Self {
             visible: false,
             buffer: Buffer::new(),
+            bar: EditorBarState::new(),
         }
     }
 
@@ -45,7 +48,9 @@ impl UserData for EditorState {
         fields.add_field_function_set("visible", |_, _, visible: bool| {
             cfg_mut!().visible = visible;
             Ok(())
-        })
+        });
+
+        fields.add_field_function_get("bar", |_, _| Ok(DUMMY_STATE.editor.bar));
     }
 
     fn add_methods<'lua, M: mlua::prelude::LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
diff --git a/src/state/view/bar.rs b/src/state/view/bar.rs
index cc59e36..f3d1e46 100644
--- a/src/state/view/bar.rs
+++ b/src/state/view/bar.rs
@@ -1,7 +1,10 @@
 use crate::state::{bar::BarState, GlobalState};
 
+use super::mode::Mode;
+
 BarState!(
     SheetViewBarState,
+    Mode,
     GlobalState::instance().sheetview.bar,
     GlobalState::instance_mut().sheetview.bar
 );