MarkdownText: link color handling

Author: expenses

internal/compiler/builtins.slint

@@ -129,6 +129,7 @@ export component MarkdownText inherits Empty {
     in property <brush> color;
     in property <TextHorizontalAlignment> horizontal-alignment;
     in property <TextVerticalAlignment> vertical-alignment;
+    in property <color> link-color: #00f;
 
     in property <string> font-family;
     in property <bool> font-italic;

internal/core/item_rendering.rs

@@ -5,7 +5,7 @@
 //! module for rendering the tree of items
 
 use super::items::*;
-use crate::graphics::{FontRequest, Image, IntRect};
+use crate::graphics::{Color, FontRequest, Image, IntRect};
 use crate::item_tree::ItemTreeRc;
 use crate::item_tree::{ItemVisitor, ItemVisitorVTable, VisitChildrenResult};
 use crate::lengths::{
@@ -299,6 +299,7 @@ pub trait RenderText {
     fn letter_spacing(self: Pin<&Self>) -> LogicalLength;
     fn stroke(self: Pin<&Self>) -> (Brush, LogicalLength, TextStrokeStyle);
     fn is_markdown(self: Pin<&Self>) -> bool;
+    fn link_color(self: Pin<&Self>) -> Color;
 }
 
 impl RenderText for (SharedString, Brush) {
@@ -318,6 +319,10 @@ impl RenderText for (SharedString, Brush) {
         self.1.clone()
     }
 
+    fn link_color(self: Pin<&Self>) -> Color {
+        Default::default()
+    }
+
     fn alignment(
         self: Pin<&Self>,
     ) -> (crate::items::TextHorizontalAlignment, crate::items::TextVerticalAlignment) {

internal/core/items/text.rs

@@ -179,6 +179,10 @@ impl RenderText for ComplexText {
         self.color()
     }
 
+    fn link_color(self: Pin<&Self>) -> Color {
+        Default::default()
+    }
+
     fn alignment(
         self: Pin<&Self>,
     ) -> (super::TextHorizontalAlignment, super::TextVerticalAlignment) {
@@ -241,6 +245,7 @@ pub struct MarkdownText {
     pub stroke: Property<Brush>,
     pub stroke_width: Property<LogicalLength>,
     pub stroke_style: Property<TextStrokeStyle>,
+    pub link_color: Property<Color>,
     pub cached_rendering_data: CachedRenderingData,
 }
 
@@ -362,6 +367,10 @@ impl RenderText for MarkdownText {
         self.color()
     }
 
+    fn link_color(self: Pin<&Self>) -> Color {
+        self.link_color()
+    }
+
     fn alignment(
         self: Pin<&Self>,
     ) -> (super::TextHorizontalAlignment, super::TextVerticalAlignment) {
@@ -537,6 +546,10 @@ impl RenderText for SimpleText {
         self.color()
     }
 
+    fn link_color(self: Pin<&Self>) -> Color {
+        Default::default()
+    }
+
     fn alignment(
         self: Pin<&Self>,
     ) -> (super::TextHorizontalAlignment, super::TextVerticalAlignment) {

internal/core/textlayout/sharedparley.rs

@@ -141,7 +141,7 @@ impl LayoutOptions {
             stroke: None,
             text_wrap: text_input.wrap(),
             text_overflow: TextOverflow::Clip,
-            link_color: crate::Color::from_rgb_u8(64, 64, 255),
+            link_color: Default::default(),
         }
     }
 }
@@ -1181,7 +1181,7 @@ pub fn draw_text(
             text_overflow,
             selection: None,
             selection_foreground_color: None,
-            link_color: crate::Color::from_rgb_u8(64, 64, 255),
+            link_color: text.link_color(),
         },
     );
 
@@ -1305,7 +1305,7 @@ pub fn text_size(
             text_overflow: TextOverflow::Clip,
             selection: None,
             selection_foreground_color: None,
-            link_color: crate::Color::from_rgb_u8(64, 64, 255),
+            link_color: Default::default(),
         },
     );
     PhysicalSize::from_lengths(layout.max_width, layout.height) / scale_factor