pauljd/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-11-15 12:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Character panel: the highlighted font height icon keeps its contrast (#6304)

Browse Source 
On the open list's row of the current reference, drawn on the
accent-tinted selection fill, the icon draws its measure in the name's
colour instead of the accent, which lost its contrast there. The other
rows and the closed field keep the accent.
This commit is contained in:
HassanKhan
2026-11-13 14:19:58 +05:00
parent 6dcbf804ca
commit b219decd75
3 changed files with 82 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/widgets/dropdowns.rs
+12 -7
View File
@@ -37,9 +37,11 @@ pub fn dropdown_names_named(ui: &mut Ui, id: impl std::hash::Hash, name: Option<
/// [`dropdown_names`] whose options each show an icon before their name, in the open list and in
/// the closed field, so that a name that says little on its own is shown with a picture of what it
/// means (#6304). `icon(ui, rect, index, ink)` paints option `index`'s icon into `rect`, an
/// `icon_size` square, with `ink`, the colour the row's name is drawn in. `current` is the option
/// shown; `None` shows a blank field (characters that differ).
/// means (#6304). `icon(ui, rect, index, ink, highlighted)` paints option `index`'s icon into
/// `rect`, an `icon_size` square, with `ink`, the colour the row's name is drawn in;
/// `highlighted` is true on the open list's row of the current option, drawn on the selection
/// fill, where an accent-coloured mark would lose its contrast. `current` is the option shown;
/// `None` shows a blank field (characters that differ).
pub fn dropdown_icon_names(
ui: &mut Ui,
id: impl std::hash::Hash,
@@ -47,18 +49,21 @@ pub fn dropdown_icon_names(
options: &[&str],
width: f32,
icon_size: f32,
icon: impl Fn(&Ui, Rect, usize, egui::Color32),
icon: impl Fn(&Ui, Rect, usize, egui::Color32, bool),
) -> Option<usize> {
let icon = &icon;
let atom = move |i: usize| egui::Atom::paint(Vec2::splat(icon_size), move |ui, a| icon(ui, a.rect, i, a.fallback_text_color));
let atom = move |i: usize, highlighted: bool| {
egui::Atom::paint(Vec2::splat(icon_size), move |ui, a| icon(ui, a.rect, i, a.fallback_text_color, highlighted))
};
let shown = match current.and_then(|i| options.get(i).map(|name| (i, *name))) {
Some((i, name)) => (atom(i), egui::RichText::new(name).size(12.0)).into_atoms(),
Some((i, name)) => (atom(i, false), egui::RichText::new(name).size(12.0)).into_atoms(),
None => egui::RichText::new("").size(12.0).into_atoms(),
};
combo_atoms_named(ui, id, None, shown, width, |ui| {
let mut chosen = None;
for (i, o) in options.iter().enumerate() {
if ui.add(egui::Button::selectable(current == Some(i), (atom(i), *o))).clicked() {
let on = current == Some(i);
if ui.add(egui::Button::selectable(on, (atom(i, on), *o))).clicked() {
chosen = Some(i);
}
}