diff --git a/crates/egui/src/painter.rs b/crates/egui/src/painter.rs index 03a0a7dda9b3..d7f8ffbced72 100644 --- a/crates/egui/src/painter.rs +++ b/crates/egui/src/painter.rs @@ -465,7 +465,7 @@ impl Painter { &self, text: String, font_id: FontId, - color: crate::Color32, + color: Color32, wrap_width: f32, ) -> Arc { self.fonts(|f| f.layout(text, font_id, color, wrap_width)) @@ -476,12 +476,7 @@ impl Painter { /// Paint the results with [`Self::galley`]. #[inline] #[must_use] - pub fn layout_no_wrap( - &self, - text: String, - font_id: FontId, - color: crate::Color32, - ) -> Arc { + pub fn layout_no_wrap(&self, text: String, font_id: FontId, color: Color32) -> Arc { self.fonts(|f| f.layout(text, font_id, color, f32::INFINITY)) } diff --git a/crates/egui/src/response.rs b/crates/egui/src/response.rs index 91771f3333ef..21eee5eaef78 100644 --- a/crates/egui/src/response.rs +++ b/crates/egui/src/response.rs @@ -1092,11 +1092,11 @@ impl Response { self.ctx.debug_painter().debug_rect( self.rect, if self.hovered { - crate::Color32::DARK_GREEN + ecolor::Color32::DARK_GREEN } else if self.enabled { - crate::Color32::BLUE + ecolor::Color32::BLUE } else { - crate::Color32::RED + ecolor::Color32::RED }, format!("{:?}", self.id), ); diff --git a/crates/egui/src/widget_text.rs b/crates/egui/src/widget_text.rs index 29d59ff18d81..243a7a48133c 100644 --- a/crates/egui/src/widget_text.rs +++ b/crates/egui/src/widget_text.rs @@ -350,7 +350,7 @@ impl RichText { } = self; let line_color = text_color.unwrap_or_else(|| style.visuals.text_color()); - let text_color = text_color.unwrap_or(crate::Color32::PLACEHOLDER); + let text_color = text_color.unwrap_or(Color32::PLACEHOLDER); let font_id = { let mut font_id = text_style diff --git a/crates/epaint/src/text/fonts.rs b/crates/epaint/src/text/fonts.rs index 31f1be470c80..af2038949c4e 100644 --- a/crates/epaint/src/text/fonts.rs +++ b/crates/epaint/src/text/fonts.rs @@ -515,7 +515,7 @@ impl Fonts { &self, text: String, font_id: FontId, - color: crate::Color32, + color: ecolor::Color32, wrap_width: f32, ) -> Arc { let job = LayoutJob::simple(text, font_id, color, wrap_width); @@ -529,7 +529,7 @@ impl Fonts { &self, text: String, font_id: FontId, - color: crate::Color32, + color: ecolor::Color32, ) -> Arc { let job = LayoutJob::simple(text, font_id, color, f32::INFINITY); self.layout_job(job) @@ -544,7 +544,7 @@ impl Fonts { font_id: FontId, wrap_width: f32, ) -> Arc { - self.layout(text, font_id, crate::Color32::PLACEHOLDER, wrap_width) + self.layout(text, font_id, ecolor::Color32::PLACEHOLDER, wrap_width) } }