EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge branch 'fix/f1': community issue fixes
Clauded3e34156e5d2
diff --cc crates/ui-egui/src/panels/text_panels.rsindex 1ed3f21e0,df2e6dce2..47aacc46f--- a/crates/ui-egui/src/panels/text_panels.rs+++ b/crates/ui-egui/src/panels/text_panels.rs@@@ -565,148 -558,68 +565,153 @@@ pub(super) fn font_picker(app: &mut Effreturn None;}let rows = effectcraft_engine::font_menu(&app.session.prefs);+ let saved = ui.data(|d| d.get_temp::<FontSearch>(state_id));+ let fresh = saved.is_none();+ let mut state = saved.unwrap_or_default();+ let search_id = id.with("search");+ let (up, down, enter, escape) = ui.input_mut(|i| {+ (+ i.consume_key(egui::Modifiers::NONE, egui::Key::ArrowUp),+ i.consume_key(egui::Modifiers::NONE, egui::Key::ArrowDown),+ i.consume_key(egui::Modifiers::NONE, egui::Key::Enter),+ i.consume_key(egui::Modifiers::NONE, egui::Key::Escape),+ )+ });let preview = app.session.prefs.type_.font_preview;let t = app.tokens;- let seps = rows.iter().filter(|r| r.family.is_empty()).count();- widgets::popup_list(ui, id, pos, Rect::NOTHING, rows.len().saturating_sub(seps), seps, |ui| {- ui.set_min_width(if preview { 300.0 } else { 180.0 });- let mut chosen = None;- for r in &rows {- if r.family.is_empty() {- ui.separator();- continue;+ // The font field itself becomes editable. The popup contains only results.+ let arrow = Rect::from_min_max(pos2(rect.max.x - 22.0, rect.min.y), rect.max);+ let edit_rect = Rect::from_min_max(rect.min, pos2(arrow.min.x, rect.max.y));+ let search = ui.put(edit_rect, egui::TextEdit::singleline(&mut state.query).id(search_id).hint_text(current).font(Tokens::ui(12.0)));+ app.auto.add(&format!("{auto}.search"), search.rect, "Search fonts");+ if fresh {+ search.request_focus();+ }+ ui.memory_mut(|m| m.set_focus_lock_filter(search_id, egui::EventFilter { vertical_arrows: true, escape: true, ..Default::default() }));+ if widgets::icon_button(ui, arrow, crate::icons::Icon::ChevronDown, false, &t, id.with("arrow")).clicked() {+ ui.data_mut(|d| {+ d.insert_temp(id.with("open"), false);+ d.remove::<FontSearch>(state_id);+ });+ ui.memory_mut(|m| m.surrender_focus(search_id));+ return None;+ }+ app.auto.add(&format!("{auto}.toggle"), arrow, "Close font list");+ let mut chosen = None;+ let screen = ui.ctx().content_rect();+ let below = screen.bottom() - rect.bottom() - 16.0;+ let above = below < 100.0 && rect.top() - screen.top() > below;+ let max_height = (if above { rect.top() - screen.top() - 16.0 } else { below }).clamp(28.0, 380.0);+ let anchor = if above { rect.left_top() } else { rect.left_bottom() };+ let pivot = if above { Align2::LEFT_BOTTOM } else { Align2::LEFT_TOP };+ widgets::note_open_popup_list(ui.ctx());+ let area = egui::Area::new(id.with("area")).order(egui::Order::Foreground).pivot(pivot).fixed_pos(anchor).show(ui.ctx(), |ui| {+ egui::Frame::popup(ui.style()).show(ui, |ui| {+ ui.set_width(rect.width().max(180.0));+ let query = state.query.trim().to_lowercase();+ let mut seen = std::collections::HashSet::new();+ let filtered: Vec<_> = rows+ .iter()+ .filter(|r| {+ !r.family.is_empty()+ && (query.is_empty()+ || ((r.family.to_lowercase().contains(&query) || r.display.to_lowercase().contains(&query)) && seen.insert(&r.family)))+ })+ .collect();+ if fresh {+ state.selected = filtered.iter().position(|r| r.family == current).unwrap_or(0);+ }+ if search.changed() {+ state.selected = 0;}- let resp = ui.selectable_label(r.family == current, &r.display);- if preview && ui.is_rect_visible(resp.rect) {- let key = egui::Id::new(("font-preview", &r.family));- let lines: std::sync::Arc<Vec<Vec<[f32; 2]>>> = match ui.data(|d| d.get_temp(key)) {- Some(l) => l,- None => {- let l = std::sync::Arc::new(effectcraft_engine::font_preview(&r.family, 14.0));- ui.data_mut(|d| d.insert_temp(key, l.clone()));- l+ let last = filtered.len().saturating_sub(1);+ state.selected = state.selected.min(last);+ if down {+ state.selected = state.selected.saturating_add(1).min(last);+ }+ if up {+ state.selected = state.selected.saturating_sub(1);+ }+ if enter {+ chosen = filtered.get(state.selected).map(|r| r.family.clone());+ }+ // Give the result list its actual height even when the previous query had+ // only one row. A cached tiny Area must not collapse a reopened long list.+ let height = (filtered.len() as f32 * (24.0 + ui.spacing().item_spacing.y) + 16.0).clamp(28.0, max_height);+ ui.set_height(height);+ let mut scroll = egui::ScrollArea::vertical().id_salt(id.with("results")).max_height(height).min_scrolled_height(height);+ if search.changed() {+ scroll = scroll.vertical_scroll_offset(0.0);+ }+ scroll.show(ui, |ui| {+ if filtered.is_empty() {+ let r = ui.label(tr("No matching fonts"));+ app.auto.add(&format!("{auto}.empty"), r.rect, "No matching fonts");+ }+ let mut was_recent = false;+ for (index, r) in filtered.iter().enumerate() {+ if query.is_empty() && was_recent && !r.recent {+ ui.separator();}- };- let room = Rect::from_min_max(pos2(resp.rect.max.x - 120.0, resp.rect.min.y + 1.0), pos2(resp.rect.max.x - 6.0, resp.rect.max.y - 1.0));- if let Some((k, o)) = fit_preview(&lines, room, resp.rect.center().y + 5.0) {- let painter = ui.painter().with_clip_rect(resp.rect);- for poly in lines.iter() {- let pts: Vec<egui::Pos2> =- poly.iter().filter(|p| p[0].is_finite() && p[1].is_finite()).map(|p| (o + vec2(p[0], p[1]) * k).to_pos2()).collect();- painter.add(egui::Shape::line(pts, egui::Stroke::new(1.0, t.text_dim)));+ was_recent = r.recent;+ let row_width = ui.available_width();+ let label_width = if preview { (row_width - 100.0).max(40.0) } else { row_width };+ let resp = ui.add_sized([row_width, 24.0], egui::Button::selectable(index == state.selected, ""));+ resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, ui.is_enabled(), index == state.selected, &r.display));+ let label_rect = Rect::from_min_size(resp.rect.min + vec2(5.0, 0.0), vec2(label_width - 5.0, resp.rect.height()));+ ui.painter().with_clip_rect(label_rect.intersect(ui.clip_rect())).text(+ label_rect.left_center(),+ Align2::LEFT_CENTER,+ &r.display,+ Tokens::ui(12.0),+ t.text,+ );+ if ui.is_rect_visible(resp.rect) {+ app.auto.add(&format!("{auto}.option.{}", r.family), resp.rect, &r.display);+ }+ if index == state.selected && (fresh || up || down) {+ resp.scroll_to_me(None);+ }+ if preview && ui.is_rect_visible(resp.rect) {+ let key = egui::Id::new(("font-preview", &r.family));+ let lines: std::sync::Arc<Vec<Vec<[f32; 2]>>> = match ui.data(|d| d.get_temp(key)) {+ Some(l) => l,+ None => {+ let l = std::sync::Arc::new(effectcraft_engine::font_preview(&r.family, 14.0));+ ui.data_mut(|d| d.insert_temp(key, l.clone()));+ l+ }+ };- let o = pos2(resp.rect.max.x - 90.0, resp.rect.center().y + 5.0);- for poly in lines.iter() {- let pts: Vec<egui::Pos2> = poly.iter().map(|p| o + vec2(p[0], p[1])).collect();- ui.painter().add(egui::Shape::line(pts, egui::Stroke::new(1.0, t.text_dim)));++ // Scaled and placed to fit the row's preview column, and clipped to the row (#577).++ let room = Rect::from_min_max(pos2(resp.rect.max.x - 95.0, resp.rect.min.y + 1.0), pos2(resp.rect.max.x - 6.0, resp.rect.max.y - 1.0));++ if let Some((k, o)) = fit_preview(&lines, room, resp.rect.center().y + 5.0) {++ let painter = ui.painter().with_clip_rect(resp.rect.intersect(ui.clip_rect()));++ for poly in lines.iter() {++ let pts: Vec<egui::Pos2> =++ poly.iter().filter(|p| p[0].is_finite() && p[1].is_finite()).map(|p| (o + vec2(p[0], p[1]) * k).to_pos2()).collect();++ painter.add(egui::Shape::line(pts, egui::Stroke::new(1.0, t.text_dim)));++ }+ }}+ if resp.clicked() {+ chosen = Some(r.family.clone());+ }+ resp.on_hover_text(&r.display);}- }- if resp.clicked() {- chosen = Some(r.family.clone());- }- }- chosen- })-}--/// Where a font's "Sample" outlines (`lines`, baseline at y = 0) go in `room`: `(scale, origin)`,-/// a point `p` landing at `origin + p * scale`. At their natural size on `baseline` when they fit;-/// fonts with large or odd metrics are scaled down (never up) and moved inside, so no preview-/// spills out of its row (#577). `None`: nothing to draw.-fn fit_preview(lines: &[Vec<[f32; 2]>], room: Rect, baseline: f32) -> Option<(f32, egui::Vec2)> {- let b = lines- .iter()- .flatten()- .filter(|p| p[0].is_finite() && p[1].is_finite())- .fold(Rect::NOTHING, |b, p| b.union(Rect::from_min_max(pos2(p[0], p[1]), pos2(p[0], p[1]))));- if !(b.min.x <= b.max.x && b.min.y <= b.max.y) || !room.is_positive() {- return None;- }- let k = (room.width() / b.width().max(1e-3)).min(room.height() / b.height().max(1e-3)).min(1.0);- let mut o = vec2(room.min.x - b.min.x * k, baseline);- let (top, bottom) = (o.y + b.min.y * k, o.y + b.max.y * k);- if top < room.min.y {- o.y += room.min.y - top;- } else if bottom > room.max.y {- o.y -= bottom - room.max.y;+ });+ });+ });+ let outside = widgets::pressed_outside(ui.ctx(), &area.response) && !ui.input(|i| i.pointer.interact_pos().is_some_and(|p| rect.contains(p)));+ if chosen.is_some() || outside || escape {+ ui.data_mut(|d| {+ d.insert_temp(id.with("open"), false);+ d.remove::<FontSearch>(state_id);+ });+ ui.memory_mut(|m| m.surrender_focus(search_id));+ } else {+ ui.data_mut(|d| d.insert_temp(state_id, state));}- Some((k, o))+ chosen}/// Align panel: Align Layers to Selection / Composition, the six align buttons and the six@@@ -837,3 -750,39 +842,63 @@@ fn align_glyph(p: &egui::Painter, r: Rep.rect_filled(Rect::from_min_size(pos2(c.x + 3.0, off(9.0)), vec2(5.0, 9.0)), 1.0, t.text_dim);}}+++/// Where a font's "Sample" outlines (`lines`, baseline at y = 0) go in `room`: `(scale, origin)`,++/// a point `p` landing at `origin + p * scale`. At their natural size on `baseline` when they fit;++/// fonts with large or odd metrics are scaled down (never up) and moved inside, so no preview++/// spills out of its row (#577). `None`: nothing to draw.++fn fit_preview(lines: &[Vec<[f32; 2]>], room: Rect, baseline: f32) -> Option<(f32, egui::Vec2)> {++ let b = lines++ .iter()++ .flatten()++ .filter(|p| p[0].is_finite() && p[1].is_finite())++ .fold(Rect::NOTHING, |b, p| b.union(Rect::from_min_max(pos2(p[0], p[1]), pos2(p[0], p[1]))));++ if !(b.min.x <= b.max.x && b.min.y <= b.max.y) || !room.is_positive() {++ return None;++ }++ let k = (room.width() / b.width().max(1e-3)).min(room.height() / b.height().max(1e-3)).min(1.0);++ let mut o = vec2(room.min.x - b.min.x * k, baseline);++ let (top, bottom) = (o.y + b.min.y * k, o.y + b.max.y * k);++ if top < room.min.y {++ o.y += room.min.y - top;++ } else if bottom > room.max.y {++ o.y -= bottom - room.max.y;++ }++ Some((k, o))++}+++ #[cfg(test)]+ mod tests {+ use super::*;++ /// #577: every font's "Sample" preview lands inside its row's preview box: at its natural size+ /// when it fits, else scaled down; nothing for no outlines.+ #[test]+ fn font_previews_fit_their_row() {+ let room = Rect::from_min_max(pos2(180.0, 101.0), pos2(294.0, 119.0));+ let baseline = 115.0;+ let inside = |lines: &[Vec<[f32; 2]>]| {+ let (k, o) = fit_preview(lines, room, baseline).expect("a preview");+ for p in lines.iter().flatten() {+ let q = o + vec2(p[0], p[1]) * k;+ assert!(room.expand(0.01).contains(pos2(q.x, q.y)), "{p:?} → {q:?} outside {room:?}");+ }+ k+ };+ // A plain 14 px sample fits as it is, on the baseline.+ let plain = vec![vec![[0.0, -10.0], [60.0, -10.0], [60.0, 3.0], [0.0, 3.0]]];+ assert_eq!(inside(&plain), 1.0);+ assert_eq!(fit_preview(&plain, room, baseline).map(|(_, o)| o.y), Some(baseline));+ // Huge, wide, tall, offset and negative-bearing outlines are scaled into the box.+ for lines in [+ vec![vec![[0.0, -80.0], [400.0, 30.0]]],+ vec![vec![[-50.0, -5.0], [500.0, 2.0]]],+ vec![vec![[10.0, -200.0], [12.0, 0.0]]],+ vec![vec![[0.0, 20.0], [30.0, 40.0]]],+ ] {+ assert!(inside(&lines) <= 1.0);+ }+ assert!(fit_preview(&[], room, baseline).is_none());+ assert!(fit_preview(&[vec![[f32::NAN, 1.0]]], room, baseline).is_none());+ }+ }