aboutsummaryrefslogtreecommitdiffstats
path: root/src/common/utils
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2021-05-04 16:06:55 +0200
committerGitHub <noreply@github.com>2021-05-04 16:06:55 +0200
commit1f88b342e2a381b958da4bebd852b73e42db1a8c (patch)
tree0edaf24bdfbe85c0f51a71ecf26a29d626d9e25d /src/common/utils
parentchore: simplify boundary combination function (diff)
downloadsl0ppij-1f88b342e2a381b958da4bebd852b73e42db1a8c.tar.gz
sl0ppij-1f88b342e2a381b958da4bebd852b73e42db1a8c.tar.xz
sl0ppij-1f88b342e2a381b958da4bebd852b73e42db1a8c.zip
fix(colors): stabilize colors (#453)
* fix(colors): stabilize colors * style(fmt): rustfmt
Diffstat (limited to 'src/common/utils')
-rw-r--r--src/common/utils/shared.rs62
1 files changed, 33 insertions, 29 deletions
diff --git a/src/common/utils/shared.rs b/src/common/utils/shared.rs
index c705ed0d..7b4cbcb5 100644
--- a/src/common/utils/shared.rs
+++ b/src/common/utils/shared.rs
@@ -5,7 +5,7 @@ use std::{iter, str::from_utf8};
use strip_ansi_escapes::strip;
use colors_transform::{Color, Rgb};
-use zellij_tile::data::{Palette, PaletteSource, Theme};
+use zellij_tile::data::{Palette, PaletteColor, PaletteSource, Theme};
fn ansi_len(s: &str) -> usize {
from_utf8(&strip(s.as_bytes()).unwrap())
@@ -34,13 +34,13 @@ pub fn adjust_to_size(s: &str, rows: usize, columns: usize) -> String {
// Colors
pub mod colors {
- pub const WHITE: (u8, u8, u8) = (238, 238, 238);
- pub const GREEN: (u8, u8, u8) = (175, 255, 0);
- 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 BLACK: (u8, u8, u8) = (0, 0, 0);
+ pub const WHITE: u8 = 255;
+ pub const GREEN: u8 = 154;
+ pub const GRAY: u8 = 238;
+ pub const BRIGHT_GRAY: u8 = 245;
+ pub const RED: u8 = 88;
+ pub const ORANGE: u8 = 166;
+ pub const BLACK: u8 = 16;
}
pub fn hex_to_rgb(hex: &str) -> (u8, u8, u8) {
@@ -54,30 +54,34 @@ pub fn default_palette() -> Palette {
Palette {
source: PaletteSource::Default,
theme: Theme::Dark,
- fg: colors::BRIGHT_GRAY,
- bg: colors::GRAY,
- black: colors::BLACK,
- red: colors::RED,
- green: colors::GREEN,
- yellow: colors::GRAY,
- blue: colors::GRAY,
- magenta: colors::GRAY,
- cyan: colors::GRAY,
- white: colors::WHITE,
- orange: colors::ORANGE,
+ fg: PaletteColor::EightBit(colors::BRIGHT_GRAY),
+ bg: PaletteColor::EightBit(colors::GRAY),
+ black: PaletteColor::EightBit(colors::BLACK),
+ red: PaletteColor::EightBit(colors::RED),
+ green: PaletteColor::EightBit(colors::GREEN),
+ yellow: PaletteColor::EightBit(colors::GRAY),
+ blue: PaletteColor::EightBit(colors::GRAY),
+ magenta: PaletteColor::EightBit(colors::GRAY),
+ cyan: PaletteColor::EightBit(colors::GRAY),
+ white: PaletteColor::EightBit(colors::WHITE),
+ orange: PaletteColor::EightBit(colors::ORANGE),
}
}
// Dark magic
-pub fn detect_theme(bg: (u8, u8, u8)) -> Theme {
- let (r, g, b) = bg;
- // HSP, P stands for perceived brightness
- let hsp: f64 = (0.299 * (r as f64 * r as f64)
- + 0.587 * (g as f64 * g as f64)
- + 0.114 * (b as f64 * b as f64))
- .sqrt();
- match hsp > 127.5 {
- true => Theme::Light,
- false => Theme::Dark,
+pub fn detect_theme(bg: PaletteColor) -> Theme {
+ match bg {
+ PaletteColor::Rgb((r, g, b)) => {
+ // HSP, P stands for perceived brightness
+ let hsp: f64 = (0.299 * (r as f64 * r as f64)
+ + 0.587 * (g as f64 * g as f64)
+ + 0.114 * (b as f64 * b as f64))
+ .sqrt();
+ match hsp > 127.5 {
+ true => Theme::Light,
+ false => Theme::Dark,
+ }
+ }
+ _ => Theme::Dark,
}
}