From 219c560c7c0ad9e3960298ec125d4e64637fe84b Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Fri, 2 Aug 2024 20:41:29 +0200 Subject: add editor theme and state lua bindings --- src/config/theme/bar.rs | 17 ++++++++--------- src/config/theme/editor/bar.rs | 8 ++++++++ src/config/theme/editor/mod.rs | 22 ++++++++++++++++++---- src/config/theme/mod.rs | 15 +++++---------- src/config/theme/sheetview/bar.rs | 3 ++- 5 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 src/config/theme/editor/bar.rs (limited to 'src/config/theme') diff --git a/src/config/theme/bar.rs b/src/config/theme/bar.rs index 68a3b13..a28bede 100644 --- a/src/config/theme/bar.rs +++ b/src/config/theme/bar.rs @@ -1,16 +1,15 @@ macro_rules! BarTheme { - ($name:ident, $cfg:expr, $cfg_mut:expr) => { + ($name:ident, $type:ty, $cfg:expr, $cfg_mut:expr) => { use crate::config::theme::style::Style; 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, - pub middle: EvalTo, - pub right: EvalTo, + pub left: EvalTo, + pub middle: EvalTo, + pub right: EvalTo, } impl $name { @@ -22,7 +21,7 @@ macro_rules! BarTheme { } } - 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().style(), $cfg.middle.get(mode, lua).unwrap_or_default().style(), @@ -38,19 +37,19 @@ macro_rules! BarTheme { 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| { + fields.add_field_function_set("left", |_, _, style: EvalTo| { $cfg_mut.left = style; Ok(()) }); fields.add_field_function_get("middle", |_, _| Ok($cfg.middle.clone())); - fields.add_field_function_set("middle", |_, _, style: EvalTo| { + fields.add_field_function_set("middle", |_, _, style: EvalTo| { $cfg_mut.middle = style; Ok(()) }); fields.add_field_function_get("right", |_, _| Ok($cfg.right.clone())); - fields.add_field_function_set("right", |_, _, style: EvalTo| { + fields.add_field_function_set("right", |_, _, style: EvalTo| { $cfg_mut.right = style; Ok(()) }); diff --git a/src/config/theme/editor/bar.rs b/src/config/theme/editor/bar.rs new file mode 100644 index 0000000..62be7b0 --- /dev/null +++ b/src/config/theme/editor/bar.rs @@ -0,0 +1,8 @@ +use crate::config::{theme::bar::BarTheme, GlobalConfig}; + +BarTheme!( + EditorBarTheme, + (), + GlobalConfig::instance().theme.editor.bar, + GlobalConfig::instance_mut().theme.editor.bar +); diff --git a/src/config/theme/editor/mod.rs b/src/config/theme/editor/mod.rs index d9e2b16..662dacc 100644 --- a/src/config/theme/editor/mod.rs +++ b/src/config/theme/editor/mod.rs @@ -1,11 +1,16 @@ use mlua::UserData; +use crate::config::DUMMY_CONFIG; use crate::lua::evalsto::EvalTo; use crate::widgets::luaeditor::theme::HighlightTheme; +use self::bar::EditorBarTheme; + use super::super::GlobalConfig; use super::style::Style; +pub mod bar; + #[derive(Clone, Debug, Default)] pub struct EditorTheme { pub background: EvalTo, @@ -13,6 +18,7 @@ pub struct EditorTheme { pub cursor_line: EvalTo, pub line_number: EvalTo, pub active_line_number: EvalTo, + pub bar: EditorBarTheme, } impl EditorTheme { @@ -23,6 +29,7 @@ impl EditorTheme { cursor_line: EvalTo::Value(Style::new()), line_number: EvalTo::Value(Style::new()), active_line_number: EvalTo::Value(Style::new()), + bar: EditorBarTheme::new(), } } } @@ -65,10 +72,17 @@ impl UserData for EditorTheme { Ok(()) }); - fields.add_field_function_get("active_line_number", |_, _| Ok(cfg!().active_line_number.clone())); - fields.add_field_function_set("active_line_number", |_, _, active_line_number: EvalTo| { - cfg_mut!().active_line_number = active_line_number; - Ok(()) + fields.add_field_function_get("active_line_number", |_, _| { + Ok(cfg!().active_line_number.clone()) }); + fields.add_field_function_set( + "active_line_number", + |_, _, active_line_number: EvalTo| { + cfg_mut!().active_line_number = active_line_number; + Ok(()) + }, + ); + + fields.add_field_method_get("bar", |_, _| Ok(DUMMY_CONFIG.theme.editor.bar)) } } diff --git a/src/config/theme/mod.rs b/src/config/theme/mod.rs index ca9723b..b714e86 100644 --- a/src/config/theme/mod.rs +++ b/src/config/theme/mod.rs @@ -1,14 +1,13 @@ - use mlua::UserData; use self::{editor::EditorTheme, sheetview::SheetViewTheme}; use super::DUMMY_CONFIG; -pub mod style; -pub mod sheetview; -pub mod editor; mod bar; +pub mod editor; +pub mod sheetview; +pub mod style; #[derive(Clone, Debug, Default)] pub struct Theme { @@ -27,12 +26,8 @@ impl Theme { impl UserData for Theme { fn add_fields<'lua, F: mlua::prelude::LuaUserDataFields<'lua, Self>>(fields: &mut F) { - fields.add_field_function_get("sheetview", |_, _| { - Ok(DUMMY_CONFIG.theme.sheetview) - }); + fields.add_field_function_get("sheetview", |_, _| Ok(DUMMY_CONFIG.theme.sheetview)); - fields.add_field_function_get("editor", |_, _| { - Ok(DUMMY_CONFIG.theme.editor) - }) + fields.add_field_function_get("editor", |_, _| Ok(DUMMY_CONFIG.theme.editor)) } } diff --git a/src/config/theme/sheetview/bar.rs b/src/config/theme/sheetview/bar.rs index c3d1d50..b23f785 100644 --- a/src/config/theme/sheetview/bar.rs +++ b/src/config/theme/sheetview/bar.rs @@ -1,8 +1,9 @@ use super::super::bar::BarTheme; -use crate::config::GlobalConfig; +use crate::{config::GlobalConfig, state::view::mode::Mode}; BarTheme!( SheetViewBarTheme, + Mode, GlobalConfig::instance().theme.sheetview.bar, GlobalConfig::instance_mut().theme.sheetview.bar ); -- cgit v1.2.3-70-g09d2