WidgetText in ComboBox

Author: emilk

egui/src/containers/collapsing_header.rs

@@ -333,7 +333,7 @@ impl CollapsingHeader {
             paint_icon(ui, openness, &icon_response);
         }
 
-        text.paint(ui, text_pos, &visuals);
+        text.paint(ui.painter(), text_pos, &visuals);
 
         Prepared {
             id,

egui/src/containers/combo_box.rs

@@ -148,7 +148,6 @@ impl ComboBox {
     }
 }
 
-#[allow(clippy::needless_pass_by_value)]
 fn combo_box_dyn<'c, R>(
     ui: &mut Ui,
     button_id: Id,
@@ -183,7 +182,7 @@ fn combo_box_dyn<'c, R>(
         paint_icon(ui.painter(), icon_rect.expand(visuals.expansion), visuals);
 
         let text_rect = Align2::LEFT_CENTER.align_size_within_rect(galley.size(), rect);
-        galley.paint(ui, text_rect.min, visuals);
+        galley.paint(ui.painter(), text_rect.min, visuals);
     });
 
     if button_response.clicked() {

egui/src/containers/window.rs

@@ -832,7 +832,7 @@ impl TitleBar {
         let text_pos = text_pos - self.title_galley.galley().rect.min.to_vec2();
         let text_pos = text_pos - 1.5 * Vec2::Y; // HACK: center on x-height of text (looks better)
         self.title_galley
-            .paint_with_color(ui, text_pos, ui.visuals().text_color());
+            .paint_with_color(ui.painter(), text_pos, ui.visuals().text_color());
 
         if let Some(content_response) = &content_response {
             // paint separator between title and content:

egui/src/menu.rs

@@ -442,8 +442,8 @@ impl SubMenuButton {
             );
 
             let text_color = visuals.text_color();
-            text_galley.paint_with_color(ui, text_pos, text_color);
-            icon_galley.paint_with_color(ui, icon_pos, text_color);
+            text_galley.paint_with_color(ui.painter(), text_pos, text_color);
+            icon_galley.paint_with_color(ui.painter(), icon_pos, text_color);
         }
         response
     }

egui/src/widget_text.rs

@@ -583,17 +583,15 @@ impl WidgetTextGalley {
         &self.galley
     }
 
-    pub fn paint(self, ui: &Ui, text_pos: Pos2, visuals: &WidgetVisuals) {
+    pub fn paint(self, painter: &crate::Painter, text_pos: Pos2, visuals: &WidgetVisuals) {
         if self.galley_has_color {
-            ui.painter().galley(text_pos, self.galley);
+            painter.galley(text_pos, self.galley);
         } else {
-            ui.painter()
-                .galley_with_color(text_pos, self.galley, visuals.text_color());
+            painter.galley_with_color(text_pos, self.galley, visuals.text_color());
         }
     }
 
-    pub fn paint_with_color(self, ui: &Ui, text_pos: Pos2, text_color: Color32) {
-        ui.painter()
-            .galley_with_color(text_pos, self.galley, text_color);
+    pub fn paint_with_color(self, painter: &crate::Painter, text_pos: Pos2, text_color: Color32) {
+        painter.galley_with_color(text_pos, self.galley, text_color);
     }
 }

egui/src/widgets/button.rs

@@ -162,7 +162,7 @@ impl Widget for Button {
                 );
             }
 
-            text.paint(ui, text_pos, visuals);
+            text.paint(ui.painter(), text_pos, visuals);
         }
 
         response
@@ -260,7 +260,7 @@ impl<'a> Widget for Checkbox<'a> {
             ));
         }
 
-        text.paint(ui, text_pos, visuals);
+        text.paint(ui.painter(), text_pos, visuals);
         response
     }
 }
@@ -360,7 +360,7 @@ impl Widget for RadioButton {
             });
         }
 
-        text.paint(ui, text_pos, visuals);
+        text.paint(ui.painter(), text_pos, visuals);
         response
     }
 }

egui/src/widgets/label.rs

@@ -6,7 +6,8 @@ use crate::{widget_text::WidgetTextGalley, *};
 /// # let ui = &mut egui::Ui::__test();
 /// ui.label("Equivalent");
 /// ui.add(egui::Label::new("Equivalent"));
-/// ui.add(egui::Label::new("With Options").text_color(egui::Color32::RED));
+/// ui.add(egui::Label::new("With Options").wrap(false));
+/// ui.label(egui::RichText::new("With formatting").underline());
 /// ```
 #[must_use = "You should put this widget in an ui with `ui.add(widget);`"]
 pub struct Label {

egui/src/widgets/progress_bar.rs

@@ -1,7 +1,7 @@
 use crate::*;
 
 enum ProgressBarText {
-    Custom(String),
+    Custom(WidgetText),
     Percentage,
 }
 
@@ -31,9 +31,8 @@ impl ProgressBar {
     }
 
     /// A custom text to display on the progress bar.
-    #[allow(clippy::needless_pass_by_value)]
-    pub fn text(mut self, text: impl ToString) -> Self {
-        self.text = Some(ProgressBarText::Custom(text.to_string()));
+    pub fn text(mut self, text: impl Into<WidgetText>) -> Self {
+        self.text = Some(ProgressBarText::Custom(text.into()));
         self
     }
 
@@ -124,18 +123,16 @@ impl Widget for ProgressBar {
 
         if let Some(text_kind) = text {
             let text = match text_kind {
-                ProgressBarText::Custom(string) => string,
-                ProgressBarText::Percentage => format!("{}%", (progress * 100.0) as usize),
+                ProgressBarText::Custom(text) => text,
+                ProgressBarText::Percentage => format!("{}%", (progress * 100.0) as usize).into(),
             };
-            ui.painter().sub_region(outer_rect).text(
-                outer_rect.left_center() + vec2(ui.spacing().item_spacing.x, 0.0),
-                Align2::LEFT_CENTER,
-                text,
-                TextStyle::Button,
-                visuals
-                    .override_text_color
-                    .unwrap_or(visuals.selection.stroke.color),
-            );
+            let galley = text.into_galley(ui, Some(false), f32::INFINITY, TextStyle::Button);
+            let text_pos = outer_rect.left_center() - Vec2::new(0.0, galley.size().y / 2.0)
+                + vec2(ui.spacing().item_spacing.x, 0.0);
+            let text_color = visuals
+                .override_text_color
+                .unwrap_or(visuals.selection.stroke.color);
+            galley.paint_with_color(&ui.painter().sub_region(outer_rect), text_pos, text_color);
         }
 
         response

egui/src/widgets/selected_label.rs

@@ -73,7 +73,7 @@ impl Widget for SelectableLabel {
                 .rect(rect, corner_radius, visuals.bg_fill, visuals.bg_stroke);
         }
 
-        text.paint(ui, text_pos, &visuals);
+        text.paint(ui.painter(), text_pos, &visuals);
         response
     }
 }