Plot text can now contain rich text

egui/src/widget_text.rs

@@ -267,6 +267,7 @@ impl RichText {
 /// but it can be a [`RichText`] (text with color, style, etc),
 /// a [`LayoutJob`] (for when you want full control of how the text looks)
 /// or text that has already been layed out in a [`Galley`].
+#[derive(Clone)]
 pub enum WidgetText {
     RichText(RichText),
     /// Use this [`LayoutJob`] when laying out the text.

egui/src/widgets/plot/items/mod.rs

@@ -614,8 +614,7 @@ impl PlotItem for Polygon {
 
 /// Text inside the plot.
 pub struct Text {
-    pub(super) text: String,
+    pub(super) text: WidgetText,
-    pub(super) style: TextStyle,
     pub(super) position: Value,
     pub(super) name: String,
     pub(super) highlight: bool,
@@ -624,11 +623,9 @@ pub struct Text {
 }
 
 impl Text {
-    #[allow(clippy::needless_pass_by_value)]
+    pub fn new(position: Value, text: impl Into<WidgetText>) -> Self {
-    pub fn new(position: Value, text: impl ToString) -> Self {
         Self {
-            text: text.to_string(),
+            text: text.into(),
-            style: TextStyle::Small,
             position,
             name: Default::default(),
             highlight: false,
@@ -643,13 +640,7 @@ impl Text {
         self
     }
 
-    /// Text style. Default is `TextStyle::Small`.
+    /// Text color.
-    pub fn style(mut self, style: TextStyle) -> Self {
-        self.style = style;
-        self
-    }
-
-    /// Text color. Default is `Color32::TRANSPARENT` which means a color will be auto-assigned.
     pub fn color(mut self, color: impl Into<Color32>) -> Self {
         self.color = color.into();
         self
@@ -681,14 +672,23 @@ impl PlotItem for Text {
         } else {
             self.color
         };
+
+        let galley =
+            self.text
+                .clone()
+                .into_galley(ui, Some(false), f32::INFINITY, TextStyle::Small);
+
         let pos = transform.position_from_value(&self.position);
-        let galley = ui
-            .fonts()
-            .layout_no_wrap(self.text.clone(), self.style, color);
         let rect = self
             .anchor
             .anchor_rect(Rect::from_min_size(pos, galley.size()));
-        shapes.push(Shape::galley(rect.min, galley));
+
+        let mut text_shape = epaint::TextShape::new(rect.min, galley.galley);
+        if !galley.galley_has_color {
+            text_shape.override_text_color = Some(color);
+        }
+        shapes.push(text_shape.into());
+
         if self.highlight {
             shapes.push(Shape::rect_stroke(
                 rect.expand(2.0),