djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make weak_text_color an Option

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-10-01 14:21:35 +02:00
parent fa51e01076
commit a38123f46e
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/egui/src/style.rs
View file

@ -451,7 +451,9 @@ pub struct Visuals {
pub code_bg_color: Color32, pub code_bg_color: Color32,
/// Color used for weak text. /// Color used for weak text.
pub weak_text_color: Color32, ///
/// If `None`, a color is automatially chosen based on [`Self::text_color`] and [`Self::window_fill`].
pub weak_text_color: Option<Color32>,
/// A good color for warning text (e.g. orange). /// A good color for warning text (e.g. orange).
pub warn_fg_color: Color32, pub warn_fg_color: Color32,
@ -491,9 +493,10 @@ impl Visuals {
.unwrap_or_else(|| self.widgets.noninteractive.text_color()) .unwrap_or_else(|| self.widgets.noninteractive.text_color())
} }
#[inline]
pub fn weak_text_color(&self) -> Color32 { pub fn weak_text_color(&self) -> Color32 {
self.weak_text_color self.weak_text_color.unwrap_or_else(|| {
crate::color::tint_color_towards(self.text_color(), self.window_fill())
})
} }
#[inline(always)] #[inline(always)]
@ -679,7 +682,7 @@ impl Visuals {
faint_bg_color: Color32::from_gray(35), faint_bg_color: Color32::from_gray(35),
extreme_bg_color: Color32::from_gray(10), // e.g. TextEdit background extreme_bg_color: Color32::from_gray(10), // e.g. TextEdit background
code_bg_color: Color32::from_gray(64), code_bg_color: Color32::from_gray(64),
weak_text_color: Color32::from_gray(83), weak_text_color: None,
warn_fg_color: Color32::from_rgb(255, 143, 0), // orange warn_fg_color: Color32::from_rgb(255, 143, 0), // orange
error_fg_color: Color32::from_rgb(255, 0, 0), // red error_fg_color: Color32::from_rgb(255, 0, 0), // red
window_rounding: Rounding::same(6.0), window_rounding: Rounding::same(6.0),
@ -704,7 +707,6 @@ impl Visuals {
faint_bg_color: Color32::from_gray(242), faint_bg_color: Color32::from_gray(242),
extreme_bg_color: Color32::from_gray(255), // e.g. TextEdit background extreme_bg_color: Color32::from_gray(255), // e.g. TextEdit background
code_bg_color: Color32::from_gray(230), code_bg_color: Color32::from_gray(230),
weak_text_color: Color32::from_gray(164),
warn_fg_color: Color32::from_rgb(255, 0, 0), // red also, beecause orange doesn't look great because of https://github.com/emilk/egui/issues/1455 warn_fg_color: Color32::from_rgb(255, 0, 0), // red also, beecause orange doesn't look great because of https://github.com/emilk/egui/issues/1455
error_fg_color: Color32::from_rgb(255, 0, 0), // red error_fg_color: Color32::from_rgb(255, 0, 0), // red
window_shadow: Shadow::big_light(), window_shadow: Shadow::big_light(),
@ -1187,7 +1189,7 @@ impl Visuals {
faint_bg_color, faint_bg_color,
extreme_bg_color, extreme_bg_color,
code_bg_color, code_bg_color,
weak_text_color, weak_text_color: _, // TODO(emilk)
warn_fg_color, warn_fg_color,
error_fg_color, error_fg_color,
window_rounding, window_rounding,
@ -1231,7 +1233,6 @@ impl Visuals {
&mut widgets.noninteractive.fg_stroke.color, &mut widgets.noninteractive.fg_stroke.color,
"Text color", "Text color",
); );
ui_color(ui, weak_text_color, RichText::new("Weak text"));
ui_color(ui, warn_fg_color, RichText::new("Warnings")); ui_color(ui, warn_fg_color, RichText::new("Warnings"));
ui_color(ui, error_fg_color, RichText::new("Errors")); ui_color(ui, error_fg_color, RichText::new("Errors"));
}); });