diff options
author | denis <denismaximov98@gmail.com> | 2021-05-01 14:44:43 +0300 |
---|---|---|
committer | denis <denismaximov98@gmail.com> | 2021-05-01 14:44:43 +0300 |
commit | f85822972ad6ed19f94bc1b30a7120bcd4b091e0 (patch) | |
tree | 7b65e9da4d56a9c87ab5829a6389ac28133cf940 /zellij-tile/src | |
parent | eabecde90b1617ce4c29be9d5af3f52ccb67e45f (diff) |
chore: cleanup, fix: the tests finally pass
Diffstat (limited to 'zellij-tile/src')
-rw-r--r-- | zellij-tile/src/data.rs | 12 | ||||
-rw-r--r-- | zellij-tile/src/lib.rs | 16 |
2 files changed, 22 insertions, 6 deletions
diff --git a/zellij-tile/src/data.rs b/zellij-tile/src/data.rs index 3b53ed136..845385ca5 100644 --- a/zellij-tile/src/data.rs +++ b/zellij-tile/src/data.rs @@ -67,13 +67,13 @@ impl Default for InputMode { } } -#[derive(Clone, Copy, Debug, Serialize, Deserialize)] +#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)] pub enum Theme { Light, Dark, } -#[derive(Clone, Copy, Debug, Serialize, Deserialize)] +#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)] pub enum PaletteSource { Default, Xresources, @@ -84,11 +84,11 @@ pub mod colors { pub const GRAY: (u8, u8, u8) = (68, 68, 68); pub const BRIGHT_GRAY: (u8, u8, u8) = (138, 138, 138); pub const RED: (u8, u8, u8) = (135, 0, 0); - pub const ORANGE: (u8, u8, u8) = (215,95,0); + pub const ORANGE: (u8, u8, u8) = (215, 95, 0); pub const BLACK: (u8, u8, u8) = (0, 0, 0); } -#[derive(Clone, Copy, Debug, Serialize, Deserialize)] +#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)] pub struct Palette { pub source: PaletteSource, pub theme: Theme, @@ -102,7 +102,7 @@ pub struct Palette { pub magenta: (u8, u8, u8), pub cyan: (u8, u8, u8), pub white: (u8, u8, u8), - pub orange: (u8, u8, u8) + pub orange: (u8, u8, u8), } impl Default for Palette { @@ -120,7 +120,7 @@ impl Default for Palette { magenta: colors::GRAY, cyan: colors::GRAY, white: colors::WHITE, - orange: colors::ORANGE + orange: colors::ORANGE, } } } diff --git a/zellij-tile/src/lib.rs b/zellij-tile/src/lib.rs index af7d8ca12..3ab490613 100644 --- a/zellij-tile/src/lib.rs +++ b/zellij-tile/src/lib.rs @@ -39,3 +39,19 @@ macro_rules! register_plugin { } }; } + +#[macro_export] +macro_rules! rgb { + ($a:expr) => { + ansi_term::Color::RGB($a.0, $a.1, $a.2) + }; +} + +#[macro_export] +macro_rules! style { + ($a:expr, $b:expr) => { + ansi_term::Style::new() + .fg(ansi_term::Color::RGB($a.0, $a.1, $a.2)) + .on(ansi_term::Color::RGB($b.0, $b.1, $b.2)) + }; +} |