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/config/theme/mod.rs | 10 +++--- src/config/theme/sheetview/bar.rs | 9 ----- src/config/theme/sheetview/mod.rs | 74 --------------------------------------- src/config/theme/view/bar.rs | 9 +++++ src/config/theme/view/mod.rs | 74 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 88 deletions(-) delete mode 100644 src/config/theme/sheetview/bar.rs delete mode 100644 src/config/theme/sheetview/mod.rs create mode 100644 src/config/theme/view/bar.rs create mode 100644 src/config/theme/view/mod.rs (limited to 'src/config/theme') diff --git a/src/config/theme/mod.rs b/src/config/theme/mod.rs index b714e86..0f5f94a 100644 --- a/src/config/theme/mod.rs +++ b/src/config/theme/mod.rs @@ -1,24 +1,24 @@ use mlua::UserData; -use self::{editor::EditorTheme, sheetview::SheetViewTheme}; +use self::{editor::EditorTheme, view::SheetViewTheme}; use super::DUMMY_CONFIG; mod bar; pub mod editor; -pub mod sheetview; +pub mod view; pub mod style; #[derive(Clone, Debug, Default)] pub struct Theme { - pub sheetview: SheetViewTheme, + pub view: SheetViewTheme, pub editor: EditorTheme, } impl Theme { pub const fn new() -> Self { Self { - sheetview: SheetViewTheme::new(), + view: SheetViewTheme::new(), editor: EditorTheme::new(), } } @@ -26,7 +26,7 @@ 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("view", |_, _| Ok(DUMMY_CONFIG.theme.view)); 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 deleted file mode 100644 index b23f785..0000000 --- a/src/config/theme/sheetview/bar.rs +++ /dev/null @@ -1,9 +0,0 @@ -use super::super::bar::BarTheme; -use crate::{config::GlobalConfig, state::view::mode::Mode}; - -BarTheme!( - SheetViewBarTheme, - Mode, - GlobalConfig::instance().theme.sheetview.bar, - GlobalConfig::instance_mut().theme.sheetview.bar -); diff --git a/src/config/theme/sheetview/mod.rs b/src/config/theme/sheetview/mod.rs deleted file mode 100644 index fc999ca..0000000 --- a/src/config/theme/sheetview/mod.rs +++ /dev/null @@ -1,74 +0,0 @@ -use mlua::UserData; -use ratatui::style::Color; - -use crate::{config::{GlobalConfig, DUMMY_CONFIG}, lua::evalsto::EvalTo, sheet::cell::CellRef}; - -use self::bar::SheetViewBarTheme; - -use super::style::Style; - -pub mod bar; - -#[derive(Debug, Clone, Default)] -pub struct SheetViewTheme { - pub cursor: EvalTo, - pub selection: EvalTo, - pub cell: EvalTo, - pub background: EvalTo, - pub bar: SheetViewBarTheme, -} - -impl SheetViewTheme { - pub const fn new() -> Self { - Self { - cursor: EvalTo::Value(Style::new().fg(Color::Black).bg(Color::White)), - selection: EvalTo::Value(Style::new().fg(Color::White).bg(Color::DarkGray)), - cell: EvalTo::Value(Style::new().fg(Color::White).bg(Color::Black)), - background: EvalTo::Value(Style::new().bg(Color::Black)), - bar: SheetViewBarTheme::new(), - } - } -} - -macro_rules! cfg { - () => { - GlobalConfig::instance().theme.sheetview - }; -} - -macro_rules! cfg_mut { - () => { - GlobalConfig::instance_mut().theme.sheetview - }; -} - -impl UserData for SheetViewTheme { - fn add_fields<'lua, F: mlua::prelude::LuaUserDataFields<'lua, Self>>(fields: &mut F) { - fields.add_field_function_get("cursor", |_, _| Ok(cfg!().cursor.clone())); - - fields.add_field_function_set("cursor", |_, _, pair: EvalTo| { - cfg_mut!().cursor = pair; - Ok(()) - }); - - fields.add_field_function_get("selection", |_, _| Ok(cfg!().selection.clone())); - fields.add_field_function_set("selection", |_, _, pair: EvalTo| { - cfg_mut!().selection = pair; - Ok(()) - }); - - fields.add_field_function_get("cell", |_, _| Ok(cfg!().cell.clone())); - fields.add_field_function_set("cell", |_, _, cell: EvalTo| { - cfg_mut!().cell = cell; - Ok(()) - }); - - fields.add_field_function_get("background", |_, _| Ok(cfg!().background.clone())); - fields.add_field_function_set("background", |_, _, background: EvalTo| { - cfg_mut!().background = background; - Ok(()) - }); - - fields.add_field_function_get("bar", |_, _| Ok(DUMMY_CONFIG.theme.sheetview.bar)) - } -} diff --git a/src/config/theme/view/bar.rs b/src/config/theme/view/bar.rs new file mode 100644 index 0000000..7fab31a --- /dev/null +++ b/src/config/theme/view/bar.rs @@ -0,0 +1,9 @@ +use super::super::bar::BarTheme; +use crate::{config::GlobalConfig, state::view::mode::Mode}; + +BarTheme!( + SheetViewBarTheme, + Mode, + GlobalConfig::instance().theme.view.bar, + GlobalConfig::instance_mut().theme.view.bar +); diff --git a/src/config/theme/view/mod.rs b/src/config/theme/view/mod.rs new file mode 100644 index 0000000..e88e9ad --- /dev/null +++ b/src/config/theme/view/mod.rs @@ -0,0 +1,74 @@ +use mlua::UserData; +use ratatui::style::Color; + +use crate::{config::{GlobalConfig, DUMMY_CONFIG}, lua::evalsto::EvalTo, sheet::cell::CellRef}; + +use self::bar::SheetViewBarTheme; + +use super::style::Style; + +pub mod bar; + +#[derive(Debug, Clone, Default)] +pub struct SheetViewTheme { + pub cursor: EvalTo, + pub selection: EvalTo, + pub cell: EvalTo, + pub background: EvalTo, + pub bar: SheetViewBarTheme, +} + +impl SheetViewTheme { + pub const fn new() -> Self { + Self { + cursor: EvalTo::Value(Style::new().fg(Color::Black).bg(Color::White)), + selection: EvalTo::Value(Style::new().fg(Color::White).bg(Color::DarkGray)), + cell: EvalTo::Value(Style::new().fg(Color::White).bg(Color::Black)), + background: EvalTo::Value(Style::new().bg(Color::Black)), + bar: SheetViewBarTheme::new(), + } + } +} + +macro_rules! cfg { + () => { + GlobalConfig::instance().theme.view + }; +} + +macro_rules! cfg_mut { + () => { + GlobalConfig::instance_mut().theme.view + }; +} + +impl UserData for SheetViewTheme { + fn add_fields<'lua, F: mlua::prelude::LuaUserDataFields<'lua, Self>>(fields: &mut F) { + fields.add_field_function_get("cursor", |_, _| Ok(cfg!().cursor.clone())); + + fields.add_field_function_set("cursor", |_, _, pair: EvalTo| { + cfg_mut!().cursor = pair; + Ok(()) + }); + + fields.add_field_function_get("selection", |_, _| Ok(cfg!().selection.clone())); + fields.add_field_function_set("selection", |_, _, pair: EvalTo| { + cfg_mut!().selection = pair; + Ok(()) + }); + + fields.add_field_function_get("cell", |_, _| Ok(cfg!().cell.clone())); + fields.add_field_function_set("cell", |_, _, cell: EvalTo| { + cfg_mut!().cell = cell; + Ok(()) + }); + + fields.add_field_function_get("background", |_, _| Ok(cfg!().background.clone())); + fields.add_field_function_set("background", |_, _, background: EvalTo| { + cfg_mut!().background = background; + Ok(()) + }); + + fields.add_field_function_get("bar", |_, _| Ok(DUMMY_CONFIG.theme.view.bar)) + } +} -- cgit v1.2.3-70-g09d2