Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

UI: every font field opens the same searchable font menu, with the search ready for typing and hidden system fonts left out

aionggcab09f41eb85
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index 34832db14..7a426adc8 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -1714,14 +1714,14 @@ fn regex_ok(p: &str) -> Result<(), ()> {
fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
let name = d.s("name");
- let Some(st) = app.session.active() else { return };
- let Some(style) = st.doc.styles.para(&name).cloned() else {
+ let Some(doc) = app.session.active().map(|s| s.doc.clone()) else { return };
+ let Some(style) = doc.styles.para(&name).cloned() else {
ui.label(format!("No style named {name}"));
return;
};
- let names: Vec<String> = st.doc.styles.paragraph.iter().map(|p| p.name.clone()).filter(|n| *n != name).collect();
- let (pp, cp) = st.doc.styles.resolve_para_style(&name);
- let units = st.doc.settings.horizontal_units;
+ let names: Vec<String> = doc.styles.paragraph.iter().map(|p| p.name.clone()).filter(|n| *n != name).collect();
+ let (pp, cp) = doc.styles.resolve_para_style(&name);
+ let units = doc.settings.horizontal_units;
let pv = serde_json::to_value(&pp).unwrap_or_default();
let cv = serde_json::to_value(&cp).unwrap_or_default();
let cur = |d: &Dialog, k: &str, base: &Value| d.fields.get(k).cloned().unwrap_or_else(|| base.clone());
@@ -1971,15 +1971,12 @@ fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
}
"chars" => {
let fonts = crate::panels::fonts(app);
- let menu = crate::panels::font_menu(app);
egui::Grid::new("psc").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Font Family:"));
let fam = cur(d, "c.fontFamily", &cv["fontFamily"]).as_str().unwrap_or("").to_string();
- egui::ComboBox::from_id_salt("psfam").selected_text(crate::panels::font_label(app, &menu, &fam)).width(200.0).show_ui(ui, |ui| {
- if let Some(f) = crate::panels::font_menu_rows(app, ui, &menu, &fam) {
- d.fields.insert("c.fontFamily".into(), json!(f));
- }
- });
+ if let Some(f) = crate::panels::font_combo(app, ui, "psfam", &fam, 200.0) {
+ d.fields.insert("c.fontFamily".into(), json!(f));
+ }
ui.end_row();
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Font Style:"));
let sty = cur(d, "c.fontStyle", &cv["fontStyle"]).as_str().unwrap_or("").to_string();
@@ -2108,10 +2105,10 @@ fn paragraph_style_options(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialo
}
"color" => {
let cur_fill = cur(d, "c.fill", &cv["fill"]).as_str().unwrap_or("").to_string();
- let swatches: Vec<String> = st.doc.swatches.iter().map(|s| s.name.clone()).collect();
+ let swatches: Vec<String> = doc.swatches.iter().map(|s| s.name.clone()).collect();
egui::ScrollArea::vertical().max_height(260.0).show(ui, |ui| {
for sw in swatches {
- let (c, g) = crate::widgets::swatch_colors(&st.doc, &sw, 1.0);
+ let (c, g) = crate::widgets::swatch_colors(&doc, &sw, 1.0);
ui.horizontal(|ui| {
let (r, _) = ui.allocate_exact_size(egui::vec2(14.0, 14.0), egui::Sense::hover());
crate::widgets::paint_chip(ui.painter(), r, c, g);
@@ -2629,12 +2626,11 @@ fn find_font(app: &mut DesignApp, ui: &mut egui::Ui, d: &mut Dialog) {
ui.add_space(8.0);
crate::rtl::label(ui, egui::RichText::new(crate::i18n::tr(&app.ui.language, "Replace With")).font(semibold(12.0)));
let db = crate::panels::fonts(app);
- let menu = crate::panels::font_menu(app);
- let english = app.session.prefs.show_font_names_in_english;
- let fam_opts: Vec<(&str, &str)> = menu.iter().map(|f| (f.family.as_str(), f.label(english))).collect();
egui::Grid::new("ff_to").num_columns(2).spacing([8.0, 6.0]).show(ui, |ui| {
crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Font Family:"));
- combo(ui, d, "toFamily", &fam_opts);
+ if let Some(f) = crate::panels::font_combo(app, ui, "toFamily", &d.s("toFamily"), 170.0) {
+ d.fields.insert("toFamily".into(), json!(f));
+ }
ui.end_row();
let styles = db.styles(&d.s("toFamily"));
let st_opts: Vec<(&str, &str)> = styles.iter().map(|s| (s.as_str(), s.as_str())).collect();
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 7b474fa21..9758c7d5e 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -884,3 +884,45 @@ mod tests {
assert_eq!(ui.snap_view().zone_px, 0.0);
}
}
+
+/// The whole window in a headless test harness, at a chosen window size.
+#[cfg(test)]
+pub(crate) mod test_window {
+ use egui_kittest::Harness;
+
+ pub struct Window {
+ pub app: crate::DesignApp,
+ ready: bool,
+ }
+
+ /// The window at `size` with a new document open.
+ pub fn open(mut app: crate::DesignApp, size: egui::Vec2) -> Harness<'static, Window> {
+ if app.session.active().is_none() {
+ app.run("file.new", serde_json::json!({})).unwrap();
+ }
+ let mut h = Harness::builder().with_size(size).with_max_steps(1000).build_ui_state(
+ |ui, w: &mut Window| {
+ // The builder runs a frame before the texture size can be raised: skip it.
+ if !w.ready {
+ return;
+ }
+ let ctx = ui.ctx().clone();
+ w.app.logic(&ctx);
+ w.app.ui(ui);
+ },
+ Window { app, ready: false },
+ );
+ h.input_mut().max_texture_side = Some(8192);
+ h.state_mut().ready = true;
+ h.run_steps(6);
+ h
+ }
+
+ /// A primary click at `pos`, then a few frames.
+ pub fn click_at(h: &mut Harness<'static, Window>, pos: egui::Pos2) {
+ h.hover_at(pos);
+ h.drag_at(pos);
+ h.drop_at(pos);
+ h.run_steps(4);
+ }
+}
diff --git a/crates/ui-egui/src/panels/glyphs.rs b/crates/ui-egui/src/panels/glyphs.rs
index d0fa75efc..3fb9d00eb 100644
--- a/crates/ui-egui/src/panels/glyphs.rs
+++ b/crates/ui-egui/src/panels/glyphs.rs
@@ -33,13 +33,10 @@ pub fn show(app: &mut DesignApp, ui: &mut egui::Ui) {
}
let (db, scope) = (super::fonts(app), super::font_scope(app));
ui.horizontal(|ui| {
- let menu = super::font_menu(app);
- egui::ComboBox::from_id_salt("glyph_family").selected_text(super::font_label(app, &menu, &st.family)).width(140.0).show_ui(ui, |ui| {
- if let Some(f) = super::font_menu_rows(app, ui, &menu, &st.family) {
- st.style = db.styles(&f).into_iter().next().unwrap_or_else(|| "Regular".into());
- st.family = f;
- }
- });
+ if let Some(f) = super::font_combo(app, ui, "glyph_family", &st.family, 140.0) {
+ st.style = db.styles(&f).into_iter().next().unwrap_or_else(|| "Regular".into());
+ st.family = f;
+ }
egui::ComboBox::from_id_salt("glyph_style").selected_text(&st.style).width(80.0).show_ui(ui, |ui| {
for s in db.styles(&st.family) {
if ui.selectable_label(s == st.style, &s).clicked() {
diff --git a/crates/ui-egui/src/panels/mod.rs b/crates/ui-egui/src/panels/mod.rs
index 4bc1ad08e..301556741 100644
--- a/crates/ui-egui/src/panels/mod.rs
+++ b/crates/ui-egui/src/panels/mod.rs
@@ -112,8 +112,10 @@ pub fn fonts(app: &DesignApp) -> designcraft_fonts::ScopedFonts<'static> {
/// The font menus' families in menu order: Western (and other scripts) first, then Japanese,
/// Simplified Chinese, Traditional Chinese and Korean, each alphabetical by the name shown (CJK
/// families by their native names unless Show Font Names in English).
+/// macOS's hidden system families (named with a leading `.`) are left out.
pub fn font_menu(app: &DesignApp) -> Vec<designcraft_fonts::FamilyInfo> {
let mut v = fonts(app).family_infos();
+ v.retain(|f| !f.family.starts_with('.'));
designcraft_fonts::sort_for_menu(&mut v, app.session.prefs.show_font_names_in_english);
v
}
@@ -124,29 +126,6 @@ pub fn font_label(app: &DesignApp, menu: &[designcraft_fonts::FamilyInfo], famil
menu.iter().find(|f| f.family == family).map_or(family, |f| f.label(english)).to_string()
}
-/// `menu` as rows of a popup or combo box: the name shown (the English name on hover when they
-/// differ), a separator between groups. Returns the family clicked.
-pub fn font_menu_rows(app: &DesignApp, ui: &mut egui::Ui, menu: &[designcraft_fonts::FamilyInfo], current: &str) -> Option<String> {
- let english = app.session.prefs.show_font_names_in_english;
- let mut pick = None;
- let mut group = None;
- for f in menu {
- if group.is_some_and(|g| g != f.group) {
- ui.separator();
- }
- group = Some(f.group);
- let label = f.label(english);
- let mut resp = ui.selectable_label(f.family == current, label);
- if label != f.family {
- resp = resp.on_hover_text(&f.family);
- }
- if resp.clicked() {
- pick = Some(f.family.clone());
- }
- }
- pick
-}
-
/// The active document's font scope (0 without a document or fonts of its own).
pub fn font_scope(app: &DesignApp) -> u32 {
app.session.active().map_or(0, |d| d.doc.font_scope)
@@ -236,108 +215,189 @@ fn paint_star(p: &egui::Painter, c: egui::Pos2, r: f32, filled: bool, color: egu
}
}
-/// The Font menu: search, favourites (★, Show Favorites Only), and each family's name shown in
-/// that family.
-pub fn font_family_picker(app: &mut DesignApp, ui: &mut egui::Ui, current: &str, width: f32) {
+/// The font menu's state while it is open: the search, Show Favorites Only, the match ↑/↓ highlight
+/// and the frame it was last shown (a menu not shown the frame before has just opened).
+#[derive(Clone, Default)]
+struct FontMenuState {
+ query: String,
+ only_favs: bool,
+ highlight: Option<usize>,
+ frame: Option<u64>,
+}
+
+/// The Font menu, inside any font field's popup or combo box: a search field (it has the keyboard
+/// while the menu is open, and starts empty each time it opens), favourites (★, Show Favorites
+/// Only), and each family's name with a sample in that family, the script groups apart. ↑/↓ move
+/// through the matches and Return picks one. Returns the family picked and closes the menu; the
+/// search, Favorites and the stars keep it open (the popup closes on a click outside only).
+pub fn font_menu_body(app: &mut DesignApp, ui: &mut egui::Ui, menu: &[designcraft_fonts::FamilyInfo], current: &str, width: f32) -> Option<String> {
let (fonts, scope) = (fonts(app), font_scope(app));
- let menu = font_menu(app);
let english = app.session.prefs.show_font_names_in_english;
- let shown_current = font_label(app, &menu, current);
let mut favs = app.session.prefs.favorite_fonts.clone();
let mut pick = None;
let mut favs_changed = false;
let state_id = egui::Id::new("font_menu_state");
- let (mut query, mut only_favs): (String, bool) = ui.data(|d| d.get_temp(state_id)).unwrap_or_default();
+ let mut st: FontMenuState = ui.data(|d| d.get_temp(state_id)).unwrap_or_default();
+ let frame = ui.ctx().cumulative_frame_nr();
+ if st.frame.is_none_or(|f| f.saturating_add(1) < frame) {
+ st.query.clear();
+ st.highlight = None;
+ }
+ st.frame = Some(frame);
let t = crate::theme::Tokens::get(ui.ctx());
- egui::ComboBox::from_id_salt("font_family")
- .selected_text(if current.is_empty() { "—" } else { &shown_current })
- .width(width)
- .height(420.0)
- // The search field, Favorites and the stars keep the menu open; picking a font closes it.
- .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
- .show_ui(ui, |ui| {
- ui.set_min_width(300.0);
- ui.horizontal(|ui| {
- ui.add(
- egui::TextEdit::singleline(&mut query)
- .hint_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Search fonts")))
- .desired_width(200.0),
- );
- ui.toggle_value(&mut only_favs, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Favorites"))).on_hover_ui(|ui| {
- crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Show Favorites Only"));
- });
+ ui.set_width(width.max(300.0));
+ let search = ui
+ .horizontal(|ui| {
+ let search = ui.add(
+ egui::TextEdit::singleline(&mut st.query)
+ .hint_text(crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Search fonts")))
+ .desired_width(200.0)
+ // Return picks the highlighted match instead of leaving the field.
+ .return_key(None),
+ );
+ ui.toggle_value(&mut st.only_favs, crate::rtl::widget(ui, crate::i18n::tr(&app.ui.language, "Favorites"))).on_hover_ui(|ui| {
+ crate::rtl::label(ui, crate::i18n::tr(&app.ui.language, "Show Favorites Only"));
});
- let q = query.to_lowercase();
- let ppp = ui.ctx().pixels_per_point();
- let shown: Vec<&designcraft_fonts::FamilyInfo> =
- menu.iter().filter(|f| f.matches(&q) && (!only_favs || favs.contains(&f.family))).collect();
- let mut group = None;
- for info in shown {
- // A separator between the Western fonts and each CJK language's.
- if group.is_some_and(|g| g != info.group) {
- ui.separator();
- }
- group = Some(info.group);
- let f = &info.family;
- let label = info.label(english);
- let (row, mut resp) = ui.allocate_exact_size(egui::vec2(ui.available_width(), 24.0), egui::Sense::click());
- if !ui.is_rect_visible(row) {
- continue;
- }
- if label != f {
- resp = resp.on_hover_text(f);
- }
- if f == current {
- ui.painter().rect_filled(row, 0.0, t.row_selected);
- } else if resp.hovered() {
- ui.painter().rect_filled(row, 0.0, t.hover);
- }
- // Favourite star.
- let star = egui::Rect::from_min_size(row.min + egui::vec2(2.0, 4.0), egui::vec2(16.0, 16.0));
- let fav = favs.contains(f);
- let sr = ui.interact(star, ui.id().with(("fav", f)), egui::Sense::click());
- paint_star(ui.painter(), star.center(), 6.5, fav, if fav { t.accent } else { t.text_dim });
- if sr.clicked() {
- if fav {
- favs.retain(|x| x != f);
- } else {
- favs.push(f.clone());
- }
- favs_changed = true;
- }
- ui.painter().text(row.min + egui::vec2(22.0, 12.0), egui::Align2::LEFT_CENTER, label, egui::FontId::proportional(12.0), t.text);
- // The name in its own face (rendered once per family and scale).
- let key = egui::Id::new(("font_preview", f, scope, (ppp * 100.0) as u32, t.text.to_array()));
- let tex: Option<egui::TextureHandle> = ui.data(|d| d.get_temp(key));
- let tex = tex.unwrap_or_else(|| {
- let img = designcraft_render::glyphs::text_line(&fonts, f, "Regular", "Sample", (18.0 * ppp) as u32, t.text.to_array());
- let ci = egui::ColorImage::from_rgba_premultiplied([img.width as usize, img.height as usize], &img.pixels);
- let h = ui.ctx().load_texture(format!("font_preview_{f}"), ci, egui::TextureOptions::LINEAR);
- ui.data_mut(|d| d.insert_temp(key, h.clone()));
- h
- });
- let size = tex.size_vec2() / ppp;
- let at = egui::pos2(row.max.x - size.x - 4.0, row.center().y - size.y / 2.0);
- ui.painter().image(
- tex.id(),
- egui::Rect::from_min_size(at, size),
- egui::Rect::from_min_max(egui::pos2(0.0, 0.0), egui::pos2(1.0, 1.0)),
- egui::Color32::WHITE,
- );
- if resp.clicked() {
- pick = Some(f.clone());
- ui.close();
+ search
+ })
+ .inner;
+ // Typing always goes to the search, never to the document under the menu.
+ if !search.has_focus() {
+ search.request_focus();
+ }
+ let q = st.query.to_lowercase();
+ let shown: Vec<&designcraft_fonts::FamilyInfo> = menu.iter().filter(|f| f.matches(&q) && (!st.only_favs || favs.contains(&f.family))).collect();
+ if search.changed() {
+ st.highlight = if q.is_empty() { None } else { Some(0) };
+ }
+ let (down, up, enter) = ui.input(|i| (i.key_pressed(egui::Key::ArrowDown), i.key_pressed(egui::Key::ArrowUp), i.key_pressed(egui::Key::Enter)));
+ let last = shown.len().checked_sub(1);
+ st.highlight = match (st.highlight, last) {
+ (_, None) => None,
+ (None, Some(_)) if down => Some(0),
+ (Some(h), Some(l)) if down => Some((h + 1).min(l)),
+ (Some(h), Some(l)) if up => Some(h.saturating_sub(1).min(l)),
+ (h, Some(l)) => h.map(|h| h.min(l)),
+ };
+ if enter && let Some(f) = st.highlight.and_then(|h| shown.get(h)) {
+ pick = Some(f.family.clone());
+ }
+ let ppp = ui.ctx().pixels_per_point();
+ egui::ScrollArea::vertical().max_height(380.0).auto_shrink([false, true]).show(ui, |ui| {
+ let mut group = None;
+ for (k, info) in shown.iter().enumerate() {
+ // A separator between the Western fonts and each CJK language's.
+ if group.is_some_and(|g| g != info.group) {
+ ui.separator();
+ }
+ group = Some(info.group);
+ let f = &info.family;
+ let label = info.label(english);
+ let (row, mut resp) = ui.allocate_exact_size(egui::vec2(ui.available_width(), 24.0), egui::Sense::click());
+ let highlighted = st.highlight == Some(k);
+ if highlighted && (down || up) {
+ ui.scroll_to_rect(row, None);
+ }
+ if !ui.is_rect_visible(row) {
+ continue;
+ }
+ resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, f == current, label));
+ if label != f {
+ resp = resp.on_hover_text(f);
+ }
+ if f == current {
+ ui.painter().rect_filled(row, 0.0, t.row_selected);
+ } else if highlighted || resp.hovered() {
+ ui.painter().rect_filled(row, 0.0, t.hover);
+ }
+ // Favourite star.
+ let star = egui::Rect::from_min_size(row.min + egui::vec2(2.0, 4.0), egui::vec2(16.0, 16.0));
+ let fav = favs.contains(f);
+ let sr = ui.interact(star, ui.id().with(("fav", f)), egui::Sense::click());
+ paint_star(ui.painter(), star.center(), 6.5, fav, if fav { t.accent } else { t.text_dim });
+ if sr.clicked() {
+ if fav {
+ favs.retain(|x| x != f);
+ } else {
+ favs.push(f.clone());
}
+ favs_changed = true;
}
- });
- ui.data_mut(|d| d.insert_temp(state_id, (query, only_favs)));
+ ui.painter().text(row.min + egui::vec2(22.0, 12.0), egui::Align2::LEFT_CENTER, label, egui::FontId::proportional(12.0), t.text);
+ // The name in its own face (rendered once per family and scale).
+ let key = egui::Id::new(("font_preview", f, scope, (ppp * 100.0) as u32, t.text.to_array()));
+ let tex: Option<egui::TextureHandle> = ui.data(|d| d.get_temp(key));
+ let tex = tex.unwrap_or_else(|| {
+ let img = designcraft_render::glyphs::text_line(&fonts, f, "Regular", "Sample", (18.0 * ppp) as u32, t.text.to_array());
+ let ci = egui::ColorImage::from_rgba_premultiplied([img.width as usize, img.height as usize], &img.pixels);
+ let h = ui.ctx().load_texture(format!("font_preview_{f}"), ci, egui::TextureOptions::LINEAR);
+ ui.data_mut(|d| d.insert_temp(key, h.clone()));
+ h
+ });
+ let size = tex.size_vec2() / ppp;
+ let at = egui::pos2(row.max.x - size.x - 4.0, row.center().y - size.y / 2.0);
+ ui.painter().image(
+ tex.id(),
+ egui::Rect::from_min_size(at, size),
+ egui::Rect::from_min_max(egui::pos2(0.0, 0.0), egui::pos2(1.0, 1.0)),
+ egui::Color32::WHITE,
+ );
+ if resp.clicked() && !sr.clicked() {
+ pick = Some(f.clone());
+ }
+ }
+ });
+ ui.data_mut(|d| d.insert_temp(state_id, st));
if favs_changed {
let _ = app.run("prefs.set", json!({ "favoriteFonts": favs }));
}
- if let Some(f) = pick {
- let styles = fonts.styles(&f);
- let style = if styles.iter().any(|s| s == "Regular") { "Regular".to_string() } else { styles.first().cloned().unwrap_or_default() };
- let _ = app.run("type.char", json!({"attrs": {"fontFamily": f, "fontStyle": style}}));
+ if pick.is_some() {
+ ui.close();
+ }
+ pick
+}
+
+/// A font family combo box showing `current` by its menu name, with [`font_menu_body`] as its menu.
+/// Returns the family picked.
+pub fn font_combo(
+ app: &mut DesignApp,
+ ui: &mut egui::Ui,
+ id_salt: impl std::hash::Hash + std::fmt::Debug,
+ current: &str,
+ width: f32,
+) -> Option<String> {
+ let menu = font_menu(app);
+ let shown = if current.is_empty() { "—".to_string() } else { font_label(app, &menu, current) };
+ egui::ComboBox::from_id_salt(id_salt)
+ .selected_text(shown)
+ .width(width)
+ .height(440.0)
+ .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
+ .show_ui(ui, |ui| font_menu_body(app, ui, &menu, current, width))
+ .inner
+ .flatten()
+}
+
+/// [`font_menu_body`] in a popup under `field` (a font field the caller draws). Returns the family
+/// picked.
+pub fn font_popup(app: &mut DesignApp, field: &egui::Response, menu: &[designcraft_fonts::FamilyInfo], current: &str) -> Option<String> {
+ egui::Popup::menu(field)
+ .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
+ .show(|ui| font_menu_body(app, ui, menu, current, field.rect.width()))
+ .and_then(|r| r.inner)
+}
+
+/// Set the text's font to `family`, in its Regular style (else its first).
+pub fn apply_font_family(app: &mut DesignApp, family: &str) {
+ let styles = fonts(app).styles(family);
+ let style = if styles.iter().any(|s| s == "Regular") { "Regular".to_string() } else { styles.first().cloned().unwrap_or_default() };
+ let _ = app.run("type.char", json!({"attrs": {"fontFamily": family, "fontStyle": style}}));
+}
+
+/// The text's font family field: [`font_combo`], applied to the text.
+pub fn font_family_picker(app: &mut DesignApp, ui: &mut egui::Ui, current: &str, width: f32) {
+ if let Some(f) = font_combo(app, ui, "font_family", current, width) {
+ apply_font_family(app, &f);
}
}
@@ -397,4 +457,106 @@ mod font_menu_tests {
app.run("prefs.set", json!({"showFontNamesInEnglish": true})).unwrap();
assert_eq!(font_label(&app, &font_menu(&app), FAMILY), FAMILY);
}
+
+ #[test]
+ fn hidden_system_fonts_stay_out_of_the_font_menus() {
+ const HIDDEN: &str = ".DC UI Test Hidden";
+ designcraft_fonts::FontDb::global().add_font(font_with(HIDDEN, &['a']).unwrap());
+ let app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+ assert!(fonts(&app).family_infos().iter().any(|f| f.family == HIDDEN), "installed");
+ let menu = font_menu(&app);
+ assert!(menu.iter().all(|f| !f.family.starts_with('.')), "no hidden family is listed");
+ // Text that already uses one still shows its name.
+ assert_eq!(font_label(&app, &menu, HIDDEN), HIDDEN);
+ }
+}
+
+#[cfg(test)]
+mod font_menu_ui_tests {
+ use egui::vec2;
+ use egui_kittest::Harness;
+ use egui_kittest::kittest::Queryable;
+ use serde_json::json;
+
+ use crate::test_window::{self, Window, click_at};
+
+ /// The Type tool's selection over a new text frame's text, with the Control bar on. Returns the
+ /// story.
+ fn typing() -> (Harness<'static, Window>, u64) {
+ let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+ app.ui.control_bar = true;
+ let mut h = test_window::open(app, vec2(1440.0, 900.0));
+ let app = &mut h.state_mut().app;
+ let r = app.run("frame.create", json!({"rect": [72, 72, 300, 200], "content": "text", "text": "Hello", "caret": true})).unwrap();
+ app.run("tool.select", json!({"tool": "type"})).unwrap();
+ app.run("text.select", json!({"story": r["story"], "anchor": 0, "focus": 5})).unwrap();
+ h.run_steps(4);
+ (h, r["story"].as_u64().unwrap())
+ }
+
+ fn story_text(h: &mut Harness<'static, Window>, story: u64) -> String {
+ h.state_mut().app.run("story.get", json!({"story": story})).unwrap()["text"].as_str().unwrap().to_string()
+ }
+
+ /// The Control bar's font field, showing `family`.
+ fn field(h: &Harness<'static, Window>, family: &str) -> egui::Rect {
+ h.get_by(|n| n.role() == egui::accesskit::Role::ComboBox && n.value().as_deref() == Some(family)).rect()
+ }
+
+ /// The text in the focused search field.
+ fn search(h: &Harness<'static, Window>) -> String {
+ h.get_by(|n| n.role() == egui::accesskit::Role::TextInput && n.is_focused()).value().unwrap_or_default()
+ }
+
+ fn family(h: &mut Harness<'static, Window>) -> String {
+ h.state_mut().app.run("type.selectionAttrs", json!({})).unwrap()["chars"]["fontFamily"].as_str().unwrap().to_string()
+ }
+
+ #[test]
+ fn typing_in_the_font_menu_searches_and_never_reaches_the_story() {
+ let (mut h, story) = typing();
+ let before = story_text(&mut h, story);
+ let at = field(&h, designcraft_fonts::DEFAULT_FAMILY);
+ click_at(&mut h, at.center());
+ assert!(h.ctx.text_edit_focused(), "the search field takes the keyboard when the menu opens");
+ h.event(egui::Event::Text("source sans".into()));
+ h.run_steps(4);
+ assert_eq!(search(&h), "source sans");
+ assert_eq!(story_text(&mut h, story), before, "the typing went to the search, not the story");
+ assert!(h.query_by_label("Source Sans 3").is_some(), "a match is listed");
+ assert!(h.query_by_label(designcraft_fonts::DEFAULT_FAMILY).is_none(), "families that don't match aren't");
+ // ↓ and Return pick the first match and close the menu.
+ h.key_press(egui::Key::ArrowDown);
+ h.run_steps(2);
+ h.key_press(egui::Key::Enter);
+ h.run_steps(4);
+ assert_eq!(family(&mut h), "Source Sans 3");
+ assert_eq!(story_text(&mut h, story), before);
+ assert!(!h.ctx.text_edit_focused(), "the menu closed");
+ // Reopened, the search starts empty.
+ let at = field(&h, "Source Sans 3");
+ click_at(&mut h, at.center());
+ assert_eq!(search(&h), "", "the search starts empty");
+ // A click on a family picks it.
+ h.event(egui::Event::Text("serif 4".into()));
+ h.run_steps(4);
+ let row = h.get_by_label(designcraft_fonts::DEFAULT_FAMILY).rect();
+ click_at(&mut h, row.center());
+ assert_eq!(family(&mut h), designcraft_fonts::DEFAULT_FAMILY);
+ // Escape closes the menu and leaves the text as it was.
+ let at = field(&h, designcraft_fonts::DEFAULT_FAMILY);
+ click_at(&mut h, at.center());
+ // A star marks a favourite and keeps the menu open.
+ h.event(egui::Event::Text("serif 4".into()));
+ h.run_steps(4);
+ let row = h.get_by_label(designcraft_fonts::DEFAULT_FAMILY).rect();
+ click_at(&mut h, row.min + vec2(10.0, 12.0));
+ assert!(h.state().app.session.prefs.favorite_fonts.iter().any(|f| f == designcraft_fonts::DEFAULT_FAMILY));
+ assert_eq!(search(&h), "serif 4", "the menu stays open");
+ h.key_press(egui::Key::Escape);
+ h.run_steps(4);
+ assert!(!h.ctx.text_edit_focused(), "the menu closed");
+ assert_eq!(story_text(&mut h, story), before);
+ assert!(h.state().app.session.active().unwrap().selection.text.is_some(), "the text is still selected");
+ }
}
diff --git a/crates/ui-egui/src/panels/properties.rs b/crates/ui-egui/src/panels/properties.rs
index 8644fe796..18dd1a381 100644
--- a/crates/ui-egui/src/panels/properties.rs
+++ b/crates/ui-egui/src/panels/properties.rs
@@ -999,20 +999,8 @@ fn character_section(app: &mut DesignApp, ui: &mut Ui) {
egui::FontId::proportional(11.5),
t.text,
);
- let mut pick_fam = None;
- egui::Popup::menu(&resp).show(|ui| {
- ui.set_min_width(fw);
- egui::ScrollArea::vertical().max_height(360.0).show(ui, |ui| {
- if let Some(f) = super::font_menu_rows(app, ui, &menu, &fam) {
- pick_fam = Some(f);
- ui.close();
- }
- });
- });
- if let Some(f) = pick_fam {
- let styles = fonts.styles(&f);
- let style = if styles.iter().any(|s| s == "Regular") { "Regular".to_string() } else { styles.first().cloned().unwrap_or_default() };
- let _ = app.run("type.char", json!({"attrs": {"fontFamily": f, "fontStyle": style}}));
+ if let Some(f) = super::font_popup(app, &resp, &menu, &fam) {
+ super::apply_font_family(app, &f);
}
ui.add_space(1.0);
let styles = fonts.styles(&fam);
diff --git a/crates/ui-egui/src/taskbar.rs b/crates/ui-egui/src/taskbar.rs
index 47b05ff92..4174a27e1 100644
--- a/crates/ui-egui/src/taskbar.rs
+++ b/crates/ui-egui/src/taskbar.rs
@@ -109,15 +109,10 @@ fn text_controls(app: &mut DesignApp, ui: &mut Ui, in_text: bool) {
let sty = c["fontStyle"].as_str().unwrap_or("").to_string();
let fonts = panels::fonts(app);
let menu = panels::font_menu(app);
- let english = app.session.prefs.show_font_names_in_english;
- let labels: Vec<String> = menu.iter().map(|f| f.label(english).to_string()).collect();
- let cur = menu.iter().position(|f| f.family == fam);
let shown = if fam.is_empty() { "—".to_string() } else { panels::font_label(app, &menu, &fam) };
- if let Some(f) = widgets::dropdown_list(ui, &shown, 150.0, &labels, cur).and_then(|k| menu.get(k)) {
- let f = f.family.clone();
- let styles = fonts.styles(&f);
- let style = if styles.iter().any(|s| s == "Regular") { "Regular".to_string() } else { styles.first().cloned().unwrap_or_default() };
- let _ = app.run("type.char", json!({"attrs": {"fontFamily": f, "fontStyle": style}}));
+ let field = widgets::dropdown(ui, &shown, 150.0);
+ if let Some(f) = panels::font_popup(app, &field, &menu, &fam) {
+ panels::apply_font_family(app, &f);
}
let styles = fonts.styles(&fam);
let cur = styles.iter().position(|s| *s == sty);