Merge pull request #681 from kas-gui/push-rnuwvsmrnuzn

Fix text selection color when using UI theme

Author: dhardy

crates/kas-core/src/text/format.rs

@@ -23,12 +23,28 @@ pub struct Color(NonZeroU32);
 impl Default for Color {
     /// Use a theme-defined color (automatic)
     fn default() -> Self {
-        let color = Rgba8Srgb::rgba(1, 0, 0, 0);
-        Color(NonZeroU32::new(u32::from_ne_bytes(color.0)).unwrap())
+        Self::DEFAULT
     }
 }
 
 impl Color {
+    /// Use the default theme-defined color
+    ///
+    /// As a foreground color, this maps to [`ColorsLinear::text`] or
+    /// [`ColorsLinear::text_invert`] depending on the background.
+    ///
+    /// As a background color, this maps to [`ColorsLinear::edit_bg`].
+    pub const DEFAULT: Self =
+        Color(NonZeroU32::new(u32::from_ne_bytes(Rgba8Srgb::rgba(1, 0, 0, 0).0)).unwrap());
+
+    /// Use the text-selection color
+    ///
+    /// As a foreground color this is identical to [`Self::DEFAULT`].
+    ///
+    /// As a background color, this maps to [`ColorsLinear::text_sel_bg`].
+    pub const SELECTION: Self =
+        Color(NonZeroU32::new(u32::from_ne_bytes(Rgba8Srgb::rgba(1, 1, 0, 0).0)).unwrap());
+
     /// Use an RGBA sRGB color
     ///
     /// This will resolve to the default theme color if `color.a() == 0`.
@@ -64,13 +80,9 @@ impl Color {
         self.as_rgba_srgb().map(|c| c.into())
     }
 
-    /// Resolve color
-    ///
-    /// If this represents a valid palette index, the palette's color will be
-    /// used, otherwise the color will be inferred from the theme, using `bg`
-    /// if provided.
+    /// Resolve as (foreground) text color
     #[inline]
-    pub fn resolve_color(self, theme: &ColorsLinear, bg: Option<Rgba>) -> Rgba {
+    pub fn resolve_foreground(self, theme: &ColorsLinear, bg: Option<Rgba>) -> Rgba {
         if let Some(col) = self.as_rgba() {
             col
         } else if let Some(bg) = bg {
@@ -79,6 +91,18 @@ impl Color {
             theme.text
         }
     }
+
+    /// Resolve as background color
+    #[inline]
+    pub fn resolve_background(self, theme: &ColorsLinear) -> Rgba {
+        if let Some(col) = self.as_rgba() {
+            col
+        } else if self == Self::SELECTION {
+            theme.text_sel_bg
+        } else {
+            theme.edit_bg
+        }
+    }
 }
 
 /// Effect formatting marker: text and background color
@@ -93,14 +117,6 @@ pub struct Colors {
     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.edit_bg))
-    }
-}
-
 /// Decoration types
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

crates/kas-core/src/text/raster.rs

@@ -554,7 +554,7 @@ impl State {
                 .map(|e| e.1 == Default::default())
                 .unwrap_or(true)
         {
-            let col = Color::default().resolve_color(theme, None);
+            let col = Color::default().resolve_foreground(theme, None);
             self.text_with_color(allocator, queue, pass, pos, bb, text, col);
             return;
         }
@@ -575,12 +575,12 @@ impl State {
                     }
                 };
 
-                let col = token.foreground.resolve_color(theme, None);
+                let col = token.foreground.resolve_foreground(theme, None);
                 queue.push_sprite(pass, glyph.position.into(), bb, col, sprite);
             };
 
             let for_range = |p: kas_text::Vec2, x2, colors: Colors| {
-                let Some(col) = colors.resolve_background_color(theme) else {
+                let Some(col) = colors.background.map(|col| col.resolve_background(theme)) else {
                     return;
                 };
 
@@ -634,7 +634,7 @@ impl State {
                 };
 
                 // Known limitation: this cannot depend on the background color.
-                let col = token.color.resolve_color(theme, None);
+                let col = token.color.resolve_foreground(theme, None);
 
                 match token.style {
                     LineStyle::Solid => draw_quad(quad, col),

crates/kas-widgets/src/edit/editor.rs

@@ -11,7 +11,7 @@ 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::format::{Color, FormattableText};
 use kas::text::{CursorRange, NotReady, SelectionHelper, format};
 use kas::theme::{Background, Text, TextClass};
 use kas::util::UndoStack;
@@ -199,6 +199,12 @@ impl<H: Highlighter> Component<H> {
         self.id = id;
         self.text.text_mut().configure(cx);
         self.0.colors = self.text.text().scheme_colors();
+        if self.0.colors.selection_foreground == Color::default() {
+            self.0.colors.selection_foreground = Color::SELECTION;
+        }
+        if self.0.colors.selection_background == Color::default() {
+            self.0.colors.selection_background = Color::SELECTION;
+        }
         self.text.configure(&mut cx.size_cx());
     }
 

crates/kas-widgets/src/scroll_label.rs

@@ -78,7 +78,8 @@ mod SelectableText {
                 &[]
             } else {
                 tokens[1].0 = range.start;
-                tokens[1].1.background = Some(format::Color::default());
+                tokens[1].1.foreground = format::Color::SELECTION;
+                tokens[1].1.background = Some(format::Color::SELECTION);
                 tokens[2].0 = range.end;
                 let r0 = if range.start > 0 { 0 } else { 1 };
                 &tokens[r0..]