summaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorNathan Reiner <nathan@nathanreiner.xyz>2024-08-02 21:34:41 +0200
committerNathan Reiner <nathan@nathanreiner.xyz>2024-08-02 21:34:41 +0200
commitbb9944d086332ed0b8d6064316225e901c456bd7 (patch)
treed8e42f8cee5db6236b775f10346ac5cd24c888a4 /src/config
parent665eecff57a0a5f9ccb225d3781f6ecdc7637920 (diff)
change 'viewsheet' bindings to 'view'
Diffstat (limited to 'src/config')
-rw-r--r--src/config/mod.rs1
-rw-r--r--src/config/theme/mod.rs10
-rw-r--r--src/config/theme/view/bar.rs (renamed from src/config/theme/sheetview/bar.rs)4
-rw-r--r--src/config/theme/view/mod.rs (renamed from src/config/theme/sheetview/mod.rs)6
4 files changed, 11 insertions, 10 deletions
diff --git a/src/config/mod.rs b/src/config/mod.rs
index b01be62..4f8ad7d 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -6,6 +6,7 @@ use self::theme::Theme;
pub mod constants;
pub mod theme;
+pub mod keymap;
#[derive(Debug, Default)]
pub struct GlobalConfig {
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/view/bar.rs
index b23f785..7fab31a 100644
--- a/src/config/theme/sheetview/bar.rs
+++ b/src/config/theme/view/bar.rs
@@ -4,6 +4,6 @@ use crate::{config::GlobalConfig, state::view::mode::Mode};
BarTheme!(
SheetViewBarTheme,
Mode,
- GlobalConfig::instance().theme.sheetview.bar,
- GlobalConfig::instance_mut().theme.sheetview.bar
+ GlobalConfig::instance().theme.view.bar,
+ GlobalConfig::instance_mut().theme.view.bar
);
diff --git a/src/config/theme/sheetview/mod.rs b/src/config/theme/view/mod.rs
index fc999ca..e88e9ad 100644
--- a/src/config/theme/sheetview/mod.rs
+++ b/src/config/theme/view/mod.rs
@@ -32,13 +32,13 @@ impl SheetViewTheme {
macro_rules! cfg {
() => {
- GlobalConfig::instance().theme.sheetview
+ GlobalConfig::instance().theme.view
};
}
macro_rules! cfg_mut {
() => {
- GlobalConfig::instance_mut().theme.sheetview
+ GlobalConfig::instance_mut().theme.view
};
}
@@ -69,6 +69,6 @@ impl UserData for SheetViewTheme {
Ok(())
});
- fields.add_field_function_get("bar", |_, _| Ok(DUMMY_CONFIG.theme.sheetview.bar))
+ fields.add_field_function_get("bar", |_, _| Ok(DUMMY_CONFIG.theme.view.bar))
}
}