Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Preserve font name fallback in the shared dropdown menu

dotCooCooc0f615118519
diff --cc Cargo.lock
index 888135b09,4a4043140..8de9b8c3e
--- a/Cargo.lock
+++ b/Cargo.lock
@@@ -1049,17 -1086,6 +1086,17 @@@ dependencies =
"thiserror 2.0.21",
]
+[[package]]
+name = "craft-quit"
+version = "0.1.0"
- source = "git+https://github.com/storytold/craft-libs?rev=512b54355cd1418f4e8c56a3fbd7483c3c274bf3#512b54355cd1418f4e8c56a3fbd7483c3c274bf3"
++source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+dependencies = [
+ "dispatch2",
+ "egui",
+ "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
+]
+
[[package]]
name = "craft-ui"
version = "0.1.0"
diff --cc Cargo.toml
index 60e824675,79ec24655..87348ec13
--- a/Cargo.toml
+++ b/Cargo.toml
@@@ -11,10 -11,9 +11,10 @@@ rust-version = "1.95
repository = "https://github.com/storytold/effectcraft"
[workspace.dependencies]
- craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "512b54355cd1418f4e8c56a3fbd7483c3c274bf3", version = "=0.1.0", default-features = false, features = ["read"] }
- craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "512b54355cd1418f4e8c56a3fbd7483c3c274bf3" }
- craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "512b54355cd1418f4e8c56a3fbd7483c3c274bf3", features = ["egui"] }
- craft-quit = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "512b54355cd1418f4e8c56a3fbd7483c3c274bf3" }
+ craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.1.0", default-features = false, features = ["read"] }
+ craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0" }
+ craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", features = ["egui"] }
++craft-quit = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0" }
# internal
effectcraft-time = { path = "crates/time" }
effectcraft-geom = { path = "crates/geom" }
diff --cc crates/render/src/disk_cache.rs
index 26e684732,4fa2e1cb3..6afd35aba
--- a/crates/render/src/disk_cache.rs
+++ b/crates/render/src/disk_cache.rs
@@@ -841,9 -841,9 +841,18 @@@ pub fn comp_content_key(project: &effec
/// [`comp_content_key`] with [`VirtualFileId`] for paths `std::fs::metadata` cannot describe.
pub fn comp_content_key_with(project: &effectcraft_project::Project, comp: effectcraft_project::ItemId, virtual_id: Option<VirtualFileId<'_>>) -> u128 {
++ comp_content_key_for_renderer(project, comp, virtual_id, RENDER_VERSION)
++}
++
++fn comp_content_key_for_renderer(
++ project: &effectcraft_project::Project,
++ comp: effectcraft_project::ItemId,
++ virtual_id: Option<VirtualFileId<'_>>,
++ renderer: &str,
++) -> u128 {
use effectcraft_project::{ItemKind, LayerSource};
let mut h = Hash128::default();
-- h.write(RENDER_VERSION.as_bytes());
++ h.write(renderer.as_bytes());
hash_debug(&mut h, &project.settings);
let mut seen = std::collections::BTreeSet::new();
let mut stack = vec![comp];
@@@ -1001,28 -1001,6 +1010,28 @@@ mod tests
assert!(dc.get_frame(42).is_none());
}
+ #[test]
+ fn previous_renderer_frames_are_not_reused() {
+ use effectcraft_project::{Comp, ItemKind, Project};
+ use effectcraft_time::{FrameRate, Tick};
+
+ let mut project = Project::default();
+ let comp = Comp::new(2, 2, FrameRate::FPS_30, Tick::from_seconds_f64(1.0));
+ let id = project.add_item("Cached composition", effectcraft_color::Label::None, None, ItemKind::Comp(comp.into()));
+ let key = frame_key(comp_content_key(&project, id), 0, 1000, 0);
- let previous_key = 188276472871424236106264377269312920732;
++ let previous_key = frame_key(comp_content_key_for_renderer(&project, id, None, "effectcraft-render-2"), 0, 1000, 0);
+ let dir = tmpdir("previous-renderer");
+ {
+ let cache = DiskCache::open(&dir, 1 << 30).unwrap();
+ cache.put_frame_now(previous_key, 2, 2, &[9; 16]);
+ }
+ let cache = DiskCache::open(&dir, 1 << 30).unwrap();
+ assert_eq!(cache.get_frame(previous_key).unwrap().rgba, vec![9; 16]);
+ assert!(cache.get_frame(key).is_none());
+ cache.put_frame_now(key, 2, 2, &[17; 16]);
+ assert_eq!(cache.get_frame(key).unwrap().rgba, vec![17; 16]);
+ }
+
#[test]
fn persists_across_restarts_and_clears() {
let dir = tmpdir("persist");
diff --cc crates/ui-egui/src/panels/text_panels.rs
index 996aa6309,2a3fb5063..b1bd196ef
--- a/crates/ui-egui/src/panels/text_panels.rs
+++ b/crates/ui-egui/src/panels/text_panels.rs
@@@ -635,131 -635,131 +635,132 @@@ pub(super) fn font_picker(app: &mut Eff
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));
- // Filter row: a checkbox that keeps only the variable fonts.
- let filter_h = 22.0;
- let row = ui.add_sized([ui.available_width(), filter_h], egui::Button::selectable(false, ""));
- let box_rect = Rect::from_min_size(row.rect.min, vec2(18.0, filter_h));
- let label_rect = Rect::from_min_max(pos2(box_rect.max.x + 2.0, row.rect.min.y), row.rect.max);
- let boxed = widgets::checkbox(ui, box_rect, only_variable, &t, id.with("variable-check"));
- ui.painter().text(label_rect.left_center(), Align2::LEFT_CENTER, tr("Variable fonts only"), Tokens::ui(11.5), t.text);
- app.auto.add(&format!("{auto}.variable"), row.rect, "Variable fonts only");
- let toggled = row.clicked() || boxed.clicked();
- if toggled {
- only_variable = !only_variable;
- ui.data_mut(|d| d.insert_temp(variable_id, only_variable));
- // Typing goes on into the search field.
- ui.memory_mut(|m| m.request_focus(search_id));
- }
- 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()
- && (!only_variable || r.variable)
- && (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() || toggled {
- state.selected = 0;
- }
- 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);
+ let changed = search.changed();
+ let mut open = true;
+ // The search lives in the field; the menu's header is the filter row, its list the fonts.
+ let menu = craft_ui::combo::Menu::new(ui, &search)
+ .open(&mut open)
+ .height(380.0)
+ .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
+ .style(egui::style::StyleModifier::default());
+ let app_ref = &mut *app;
+ let header = |ui: &mut egui::Ui| {
+ ui.set_width(rect.width().max(180.0));
+ // Filter row: a checkbox that keeps only the variable fonts.
+ let filter_h = 22.0;
+ let row = ui.add_sized([ui.available_width(), filter_h], egui::Button::selectable(false, ""));
+ let box_rect = Rect::from_min_size(row.rect.min, vec2(18.0, filter_h));
+ let label_rect = Rect::from_min_max(pos2(box_rect.max.x + 2.0, row.rect.min.y), row.rect.max);
+ let boxed = widgets::checkbox(ui, box_rect, only_variable, &t, id.with("variable-check"));
+ ui.painter().text(label_rect.left_center(), Align2::LEFT_CENTER, tr("Variable fonts only"), Tokens::ui(11.5), t.text);
+ app_ref.auto.add(&format!("{auto}.variable"), row.rect, "Variable fonts only");
+ let toggled = row.clicked() || boxed.clicked();
+ if toggled {
+ only_variable = !only_variable;
+ ui.data_mut(|d| d.insert_temp(variable_id, only_variable));
+ // Typing goes on into the search field.
+ ui.memory_mut(|m| m.request_focus(search_id));
+ }
+ 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()
+ && (!only_variable || r.variable)
+ && (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 changed || toggled {
+ state.selected = 0;
+ }
+ 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);
+ }
+ let entered = if enter { filtered.get(state.selected).map(|r| r.family.clone()) } else { None };
+ (app_ref, filtered, query.is_empty(), state.selected, changed || toggled, entered)
+ };
+ let list = |ui: &mut egui::Ui,
+ (app, filtered, all, selected, restart, entered): (
+ &mut EffectcraftApp,
+ Vec<&effectcraft_engine::FontRow>,
+ bool,
+ usize,
+ bool,
+ Option<String>,
+ )| {
+ if restart {
+ ui.scroll_to_cursor(Some(egui::Align::TOP));
+ }
+ let mut chosen = entered;
+ 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 all && was_recent && !r.recent {
+ ui.separator();
}
- if enter {
- chosen = filtered.get(state.selected).map(|r| r.family.clone());
+ 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 == selected, ""));
+ resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, ui.is_enabled(), index == 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()));
++ let name = drawn_font_name(ui.ctx(), r);
+ ui.painter().with_clip_rect(label_rect.intersect(ui.clip_rect())).text(
+ label_rect.left_center(),
+ Align2::LEFT_CENTER,
- &r.display,
++ name,
+ 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);
}
- // 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 filter_room = filter_h + ui.spacing().item_spacing.y;
- let height = (filtered.len() as f32 * (24.0 + ui.spacing().item_spacing.y) + 16.0).clamp(28.0, (max_height - filter_room).max(28.0));
- // A minimum, from below the filter row (a maximum would move the cursor back up).
- ui.set_min_height(height);
- let mut scroll = egui::ScrollArea::vertical().id_salt(id.with("results")).max_height(height).min_scrolled_height(height);
- if search.changed() || toggled {
- scroll = scroll.vertical_scroll_offset(0.0);
+ if index == selected && (fresh || up || down) {
+ resp.scroll_to_me(None);
}
- 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();
- }
- 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::Role::Button, 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()));
- let name = drawn_font_name(ui.ctx(), r);
- ui.painter().with_clip_rect(label_rect.intersect(ui.clip_rect())).text(
- label_rect.left_center(),
- Align2::LEFT_CENTER,
- name,
- 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::unique(("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
}
- if preview && ui.is_rect_visible(resp.rect) {
- let key = egui::Id::unique(("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
- }
- };
- // 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());
+ };
+ // 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)));
}
- resp.on_hover_text(name);
}
- });
- });
- });
- 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 {
+ }
+ if resp.clicked() {
+ chosen = Some(r.family.clone());
+ }
- resp.on_hover_text(&r.display);
++ resp.on_hover_text(name);
+ }
+ chosen
+ };
+ let chosen = menu.show_ui_with_header(header, list).flatten();
+ if chosen.is_some() || !open || escape {
ui.data_mut(|d| {
d.insert_temp(id.with("open"), false);
d.remove::<FontSearch>(state_id);