hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:23:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui/colors): reuse shared rgb mapping for ansi fallback

Browse Source
This commit is contained in:
James Peter
2025-09-30 20:49:37 +10:00
parent 06dd9a7324
commit a9046650ca
3 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tui/src/colors.rs
+1 -1
View File
@@ -136,7 +136,7 @@ pub(crate) fn keyword() -> Color {
// Overlay/scrim helper: a dimmed background used behind modal overlays.
// We derive it from the current theme background so it looks consistent for
// both light and dark themes.
fn color_to_rgb(c: Color) -> (u8, u8, u8) {
pub(crate) fn color_to_rgb(c: Color) -> (u8, u8, u8) {
match c {
Color::Rgb(r, g, b) => (r, g, b),
Color::Black => (0, 0, 0),
codex-rs/tui/src/diff_render.rs
+1 -21
View File
@@ -634,27 +634,7 @@ fn style_del() -> Style {
use ratatui::style::Color;
fn color_to_rgb(c: Color) -> (u8, u8, u8) {
match c {
Color::Rgb(r, g, b) => (r, g, b),
Color::Black => (0, 0, 0),
Color::White => (255, 255, 255),
Color::Gray => (192, 192, 192),
Color::DarkGray => (128, 128, 128),
Color::Red => (205, 49, 49),
Color::Green => (13, 188, 121),
Color::Yellow => (229, 229, 16),
Color::Blue => (36, 114, 200),
Color::Magenta => (188, 63, 188),
Color::Cyan => (17, 168, 205),
Color::LightRed => (255, 102, 102),
Color::LightGreen => (102, 255, 178),
Color::LightYellow => (255, 255, 102),
Color::LightBlue => (102, 153, 255),
Color::LightMagenta => (255, 102, 255),
Color::LightCyan => (102, 255, 255),
Color::Indexed(i) => (i, i, i),
Color::Reset => color_to_rgb(crate::colors::background()),
}
crate::colors::color_to_rgb(c)
}
fn blend(bg: (u8, u8, u8), fg: (u8, u8, u8), alpha: f32) -> (u8, u8, u8) {
codex-rs/tui/src/syntax_highlight.rs
+5 -23
View File
@@ -8,30 +8,12 @@ use syntect::parsing::{SyntaxReference, SyntaxSet};
use syntect::parsing::SyntaxSetBuilder;
use syntect::util::LinesWithEndings;
// Convert a ratatui Color to RGB tuple; mirrored locally to avoid exposing internals.
// Convert a ratatui `Color` into an RGB tuple using the shared theme helper so
// ANSI-256 indexed colors resolve to the correct palette entries instead of a
// flat grayscale fallback. This keeps luminance-detection accurate even on
// terminals without truecolor support.
fn color_to_rgb(c: ratatui::style::Color) -> (u8, u8, u8) {
use ratatui::style::Color;
match c {
Color::Rgb(r, g, b) => (r, g, b),
Color::Black => (0, 0, 0),
Color::White => (255, 255, 255),
Color::Gray => (192, 192, 192),
Color::DarkGray => (128, 128, 128),
Color::Red => (205, 49, 49),
Color::Green => (13, 188, 121),
Color::Yellow => (229, 229, 16),
Color::Blue => (36, 114, 200),
Color::Magenta => (188, 63, 188),
Color::Cyan => (17, 168, 205),
Color::LightRed => (255, 102, 102),
Color::LightGreen => (102, 255, 178),
Color::LightYellow => (255, 255, 102),
Color::LightBlue => (102, 153, 255),
Color::LightMagenta => (255, 102, 255),
Color::LightCyan => (102, 255, 255),
Color::Indexed(i) => (i, i, i),
Color::Reset => (255, 255, 255),
}
crate::colors::color_to_rgb(c)
}
fn relative_luminance(rgb: (u8, u8, u8)) -> f32 {