Merge pull request #680 from kas-gui/push-zokuxsyrwxrs

dhardy · web-flow · commit 5fb3e8fbe3c1 · 2026-03-09T10:09:22.000Z
Infer editor colors from the highlighter
diff --git a/crates/kas-core/src/draw/draw.rs b/crates/kas-core/src/draw/draw.rs
@@ -137,7 +137,7 @@ impl<'a, DS: DrawSharedImpl> DrawIface<'a, DS> {
         col: Rgba,
     ) {
         let tokens = [(0, format::Colors {
-            color: format::Color::from_rgba(col),
+            foreground: format::Color::from_rgba(col),
             ..Default::default()
         })];
         self.text(pos, bounding_box, text, theme, &tokens);
diff --git a/crates/kas-core/src/text/format.rs b/crates/kas-core/src/text/format.rs
@@ -22,8 +22,6 @@ pub struct Color(NonZeroU32);
 
 impl Default for Color {
     /// Use a theme-defined color (automatic)
-    ///
-    /// For backgrounds, this uses the text-selection color.
     fn default() -> Self {
         let color = Rgba8Srgb::rgba(1, 0, 0, 0);
         Color(NonZeroU32::new(u32::from_ne_bytes(color.0)).unwrap())
@@ -89,15 +87,17 @@ impl Color {
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Colors {
-    pub color: Color,
+    /// The default text color
+    pub foreground: Color,
+    /// The text background (highlight) color
     pub background: Option<Color>,
 }
 
 impl Colors {
     /// Resolve the background color, if any
     pub fn resolve_background_color(self, theme: &ColorsLinear) -> Option<Rgba> {
         self.background
-            .map(|bg| bg.as_rgba().unwrap_or(theme.text_sel_bg))
+            .map(|bg| bg.as_rgba().unwrap_or(theme.edit_bg))
     }
 }
 
diff --git a/crates/kas-core/src/text/raster.rs b/crates/kas-core/src/text/raster.rs
@@ -575,7 +575,7 @@ impl State {
                     }
                 };
 
-                let col = token.color.resolve_color(theme, None);
+                let col = token.foreground.resolve_color(theme, None);
                 queue.push_sprite(pass, glyph.position.into(), bb, col, sprite);
             };
 
diff --git a/crates/kas-core/src/theme/draw.rs b/crates/kas-core/src/theme/draw.rs
@@ -320,7 +320,7 @@ impl<'a> DrawCx<'a> {
     pub fn text_with_color<T: FormattableText>(&mut self, rect: Rect, text: &Text<T>, color: Rgba) {
         if let Ok(display) = text.display() {
             let tokens = [(0, format::Colors {
-                color: format::Color::from_rgba(color),
+                foreground: format::Color::from_rgba(color),
                 ..Default::default()
             })];
             self.text_with_colors(rect.pos, rect, display, &tokens);
@@ -399,9 +399,10 @@ impl<'a> DrawCx<'a> {
         rect: Rect,
         text: &Text<T>,
         byte: usize,
+        color: Option<format::Color>,
     ) {
         if let Ok(text) = text.display() {
-            self.h.text_cursor(&self.id, pos, rect, text, byte);
+            self.h.text_cursor(&self.id, pos, rect, text, byte, color);
         }
     }
 
@@ -589,7 +590,15 @@ pub trait ThemeDraw {
     /// Draw an edit marker at the given `byte` index on this `text`
     ///
     /// The `text` should be prepared before calling this method.
-    fn text_cursor(&mut self, id: &Id, pos: Coord, rect: Rect, text: &TextDisplay, byte: usize);
+    fn text_cursor(
+        &mut self,
+        id: &Id,
+        pos: Coord,
+        rect: Rect,
+        text: &TextDisplay,
+        byte: usize,
+        color: Option<format::Color>,
+    );
 
     /// Draw UI element: check box
     ///
diff --git a/crates/kas-core/src/theme/simple_theme.rs b/crates/kas-core/src/theme/simple_theme.rs
@@ -378,7 +378,15 @@ impl<'a, DS: DrawSharedImpl> ThemeDraw for DrawHandle<'a, DS> {
             .decorate_text(pos.cast(), bb, text, self.cols, decorations);
     }
 
-    fn text_cursor(&mut self, id: &Id, pos: Coord, rect: Rect, text: &TextDisplay, byte: usize) {
+    fn text_cursor(
+        &mut self,
+        id: &Id,
+        pos: Coord,
+        rect: Rect,
+        text: &TextDisplay,
+        byte: usize,
+        color: Option<format::Color>,
+    ) {
         if self.ev.window_has_focus() && !self.w.anim.text_cursor(self.draw.draw, id, byte) {
             return;
         }
@@ -388,7 +396,10 @@ impl<'a, DS: DrawSharedImpl> ThemeDraw for DrawHandle<'a, DS> {
         let bb = Quad::conv(rect);
         let l_half = (0.5 * width).floor();
 
-        let mut col = self.cols.nav_focus;
+        let mut col = color
+            .and_then(|c| c.as_rgba())
+            .unwrap_or(self.cols.nav_focus);
+
         for cursor in text.text_glyph_pos(byte).rev() {
             let mut p1 = pos + Vec2::from(cursor.pos);
             let mut p2 = p1;
diff --git a/crates/kas-macros/src/extends.rs b/crates/kas-macros/src/extends.rs
@@ -109,8 +109,9 @@ impl Methods {
                 rect: Rect,
                 text: &TextDisplay,
                 byte: usize,
+                color: Option<::kas::text::format::Color>,
             ) {
-                (#base).text_cursor(id, pos, rect, text, byte);
+                (#base).text_cursor(id, pos, rect, text, byte, color);
             }
 
             fn check_box(&mut self, id: &Id, rect: Rect, checked: bool, last_change: Option<Instant>) {
diff --git a/crates/kas-widgets/src/edit/edit_box.rs b/crates/kas-widgets/src/edit/edit_box.rs
@@ -12,7 +12,7 @@ use kas::event::Scroll;
 use kas::event::components::ScrollComponent;
 use kas::messages::{ReplaceSelectedText, SetValueText};
 use kas::prelude::*;
-use kas::theme::{Background, FrameStyle, TextClass};
+use kas::theme::{FrameStyle, TextClass};
 use std::fmt::{Debug, Display};
 use std::str::FromStr;
 
@@ -110,11 +110,7 @@ mod EditBox {
         fn draw(&self, mut draw: DrawCx) {
             let mut draw_inner = draw.re();
             draw_inner.set_id(self.inner.id());
-            let bg = if self.inner.has_error() {
-                Background::Error
-            } else {
-                Background::Default
-            };
+            let bg = self.inner.background_color();
             draw_inner.frame(self.rect(), FrameStyle::EditBox, bg);
 
             self.inner
diff --git a/crates/kas-widgets/src/edit/edit_field.rs b/crates/kas-widgets/src/edit/edit_field.rs
@@ -10,7 +10,7 @@ use crate::edit::highlight::{Highlighter, Plain};
 use kas::event::CursorIcon;
 use kas::messages::{ReplaceSelectedText, SetValueText};
 use kas::prelude::*;
-use kas::theme::TextClass;
+use kas::theme::{Background, TextClass};
 use std::fmt::{Debug, Display};
 use std::ops::DerefMut;
 use std::str::FromStr;
@@ -255,10 +255,17 @@ mod EditField {
         }
 
         /// Set a new highlighter of the same type
+        #[inline]
         pub fn set_highlighter(&mut self, highlighter: H) {
             self.editor.set_highlighter(highlighter);
         }
 
+        /// Get the background color
+        #[inline]
+        pub fn background_color(&self) -> Background {
+            self.editor.background_color()
+        }
+
         /// Call the [`EditGuard`]'s `activate` method
         #[inline]
         pub fn call_guard_activate(&mut self, cx: &mut EventCx, data: &G::Data) {
diff --git a/crates/kas-widgets/src/edit/editor.rs b/crates/kas-widgets/src/edit/editor.rs
@@ -5,15 +5,15 @@
 
 //! Text editor component
 
-use super::highlight::{self, Highlighter};
+use super::highlight::{self, Highlighter, SchemeColors};
 use super::*;
 use kas::event::components::{TextInput, TextInputAction};
 use kas::event::{ElementState, FocusSource, Ime, ImePurpose, ImeSurroundingText, Scroll};
 use kas::geom::Vec2;
 use kas::prelude::*;
 use kas::text::format::FormattableText;
 use kas::text::{CursorRange, NotReady, SelectionHelper, format};
-use kas::theme::{Text, TextClass};
+use kas::theme::{Background, Text, TextClass};
 use kas::util::UndoStack;
 use std::borrow::Cow;
 use unicode_segmentation::{GraphemeCursor, UnicodeSegmentation};
@@ -31,6 +31,7 @@ pub struct EditorComponent<H: Highlighter> {
     id: Id,
     editable: bool,
     text: Text<highlight::Text<H>>,
+    colors: SchemeColors,
     selection: SelectionHelper,
     edit_x_coord: Option<f32>,
     last_edit: Option<EditOp>,
@@ -94,6 +95,7 @@ impl<H: Default + Highlighter> Default for Component<H> {
             id: Id::default(),
             editable: true,
             text: Text::new(Default::default(), TextClass::Editor, false),
+            colors: SchemeColors::default(),
             selection: Default::default(),
             edit_x_coord: None,
             last_edit: Some(EditOp::Initial),
@@ -134,6 +136,7 @@ impl<H: Highlighter> Component<H> {
             id: self.0.id,
             editable: self.0.editable,
             text: Text::new(text, class, wrap),
+            colors: self.0.colors,
             selection: self.0.selection,
             edit_x_coord: self.0.edit_x_coord,
             last_edit: self.0.last_edit,
@@ -151,6 +154,17 @@ impl<H: Highlighter> Component<H> {
         self.text.text_mut().set_highlighter(highlighter);
     }
 
+    /// Get the background color
+    pub fn background_color(&self) -> Background {
+        if self.error_state {
+            Background::Error
+        } else if let Some(c) = self.colors.background.as_rgba() {
+            Background::Rgb(c.as_rgb())
+        } else {
+            Background::Default
+        }
+    }
+
     /// Access text
     #[inline]
     pub fn text(&self) -> &Text<impl FormattableText> {
@@ -183,6 +197,8 @@ impl<H: Highlighter> Component<H> {
     #[inline]
     pub fn configure(&mut self, cx: &mut ConfigCx, id: Id) {
         self.id = id;
+        self.text.text_mut().configure(cx);
+        self.0.colors = self.text.text().scheme_colors();
         self.text.configure(&mut cx.size_cx());
     }
 
@@ -205,17 +221,33 @@ impl<H: Highlighter> Component<H> {
         let range: Range<u32> = self.selection.range().cast();
 
         let color_tokens = self.text.color_tokens();
-        let mut buf = [(0, format::Colors::default()); 3];
+        let default_colors = format::Colors {
+            foreground: self.colors.foreground,
+            background: None,
+        };
+        let mut buf = [(0, default_colors); 3];
         let mut vec = vec![];
         let tokens = if range.is_empty() {
-            color_tokens
+            if color_tokens.is_empty() {
+                &buf[..1]
+            } else {
+                color_tokens
+            }
         } else if color_tokens.is_empty() {
             buf[1].0 = range.start;
-            buf[1].1.background = Some(format::Color::default());
+            buf[1].1.foreground = self.colors.selection_foreground;
+            buf[1].1.background = Some(self.colors.selection_background);
             buf[2].0 = range.end;
             let r0 = if range.start > 0 { 0 } else { 1 };
             &buf[r0..]
         } else {
+            let set_selection_colors = |colors: &mut format::Colors| {
+                if colors.foreground == self.colors.foreground {
+                    colors.foreground = self.colors.selection_foreground;
+                }
+                colors.background = Some(self.colors.selection_background);
+            };
+
             vec.reserve(color_tokens.len() + 2);
             let mut i = 0;
             let mut change_index = range.start;
@@ -224,12 +256,12 @@ impl<H: Highlighter> Component<H> {
                 let (start, mut colors) = color_tokens[i];
                 if start < change_index {
                     if in_selection {
-                        colors.background = Some(format::Color::default());
+                        set_selection_colors(&mut colors);
                     }
                 } else if start == change_index {
                     in_selection = change_index == range.start;
                     if in_selection {
-                        colors.background = Some(format::Color::default());
+                        set_selection_colors(&mut colors);
                         change_index = range.end;
                     } else {
                         change_index = u32::MAX;
@@ -244,7 +276,7 @@ impl<H: Highlighter> Component<H> {
                     in_selection = change_index == range.start;
                     if in_selection {
                         change_index = range.end;
-                        colors.background = Some(Default::default());
+                        set_selection_colors(&mut colors);
                     } else {
                         change_index = u32::MAX;
                     };
@@ -254,15 +286,19 @@ impl<H: Highlighter> Component<H> {
                 vec.push((start, colors));
                 i += 1;
             }
+            let last_colors = if i > 0 {
+                color_tokens[i - 1].1
+            } else {
+                Default::default()
+            };
             if change_index == range.start {
-                vec.push((range.start, format::Colors {
-                    color: Default::default(),
-                    background: Some(Default::default()),
-                }));
+                let mut colors = last_colors;
+                set_selection_colors(&mut colors);
+                vec.push((range.start, colors));
                 change_index = range.end;
             }
             if change_index == range.end {
-                vec.push((range.end, format::Colors::default()));
+                vec.push((range.end, last_colors));
             }
             &vec
         };
@@ -282,7 +318,13 @@ impl<H: Highlighter> Component<H> {
         }
 
         if self.editable && draw.ev_state().has_input_focus(self.id_ref()) == Some(true) {
-            draw.text_cursor(pos, rect, &self.text, self.selection.edit_index());
+            draw.text_cursor(
+                pos,
+                rect,
+                &self.text,
+                self.selection.edit_index(),
+                Some(self.colors.cursor),
+            );
         }
     }
 
diff --git a/crates/kas-widgets/src/edit/highlight.rs b/crates/kas-widgets/src/edit/highlight.rs
diff --git a/crates/kas-widgets/src/edit/highlight/syntect.rs b/crates/kas-widgets/src/edit/highlight/syntect.rs
diff --git a/crates/kas-widgets/src/edit/highlight/text.rs b/crates/kas-widgets/src/edit/highlight/text.rs

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ impl State {`
`575`	`575`	`}`
`576`	`576`	`};`
`577`	`577`
`578`		`- let col = token.color.resolve_color(theme, None);`
	`578`	`+ let col = token.foreground.resolve_color(theme, None);`
`579`	`579`	`queue.push_sprite(pass, glyph.position.into(), bb, col, sprite);`
`580`	`580`	`};`
`581`	`581`