EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge main into fix/expression-value-color
tylerjenningsw40a9173f177f
diff --cc crates/ui-egui/src/panels/effect_controls.rsindex a236e39e8,f0c023448..f0d474641--- a/crates/ui-egui/src/panels/effect_controls.rs+++ b/crates/ui-egui/src/panels/effect_controls.rs@@@ -314,7 -320,7 +322,7 @@@ fn prop_row}}Value::Scalar(v) if matches!(prop.ui, ParamUi::Angle) => {- let (rr, dr, nv) = fw::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::new(("ec-v", uid)), *v, 1, &vt);- let (rr, dr, nv) = fw::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::unique(("ec-v", uid)), *v, 1, &t);++ let (rr, dr, nv) = fw::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::unique(("ec-v", uid)), *v, 1, &vt);app.auto.add(&format!("effectControls.prop.{uid}.value"), rr.union(dr), &fw::format_angle(*v, 1));app.auto.add(&format!("effectControls.prop.{uid}.revolutions"), rr, &prop.name);if let Some(nv) = nv {@@@ -372,7 -375,7 +377,7 @@@x += 22.0;}for d in 0..n.min(c.len()) {- let (vr, nv, _) = widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::new(("ec-v", uid, d)), c[d], 1.0, (-1e9, 1e9), 1, "", &vt);- let (vr, nv, _) = widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::unique(("ec-v", uid, d)), c[d], 1.0, (-1e9, 1e9), 1, "", &t);++ let (vr, nv, _) = widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::unique(("ec-v", uid, d)), c[d], 1.0, (-1e9, 1e9), 1, "", &vt);app.auto.add(&format!("effectControls.prop.{uid}.value.{d}"), vr, &prop.name);dims.push(vr);if let Some(nv) = nv {diff --cc crates/ui-egui/src/panels/properties.rsindex ed5a80bd8,c9d759c16..437559b24--- a/crates/ui-egui/src/panels/properties.rs+++ b/crates/ui-egui/src/panels/properties.rs@@@ -260,7 -271,7 +273,7 @@@ fn transform_row(app: &mut EffectcraftAmatch &value {Value::Scalar(v) if pr.name == "Rotation" || pr.name.ends_with(" Rotation") => {let (_, deg) = super::fx_widgets::split_angle(*v);- let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::new(("props-v", uid)), *v, decimals(deg), &vt);- let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::unique(("props-v", uid)), *v, decimals(deg), &t);++ let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::unique(("props-v", uid)), *v, decimals(deg), &vt);app.auto.add(&format!("{base}.value"), dr, &pr.name);app.auto.add(&format!("{base}.revolutions"), rr, &pr.name);if let Some(nv) = nv {@@@ -269,7 -280,7 +282,7 @@@}Value::Scalar(v) => {let range = if pr.name == "Opacity" { (0.0, 100.0) } else { (-1e9, 1e9) };- let (vr, nv, _) = widgets::hot_number_at(ui, pos2(vx, cy - 9.0), egui::Id::new(("props-v", uid)), *v, 0.5, range, decimals(*v), suffix, &vt);- let (vr, nv, _) = widgets::hot_number_at(ui, pos2(vx, cy - 9.0), egui::Id::unique(("props-v", uid)), *v, 0.5, range, decimals(*v), suffix, &t);++ let (vr, nv, _) = widgets::hot_number_at(ui, pos2(vx, cy - 9.0), egui::Id::unique(("props-v", uid)), *v, 0.5, range, decimals(*v), suffix, &vt);app.auto.add(&format!("{base}.value"), vr, &pr.name);if let Some(nv) = nv {set(actions, json!(nv));@@@ -295,7 -306,7 +308,7 @@@}for d in 0..n.min(c.len()) {let (vr, nv, _) =- widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::new(("props-v", uid, d)), c[d], 1.0, (-1e9, 1e9), decimals(c[d]), suffix, &vt);- widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::unique(("props-v", uid, d)), c[d], 1.0, (-1e9, 1e9), decimals(c[d]), suffix, &t);++ widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::unique(("props-v", uid, d)), c[d], 1.0, (-1e9, 1e9), decimals(c[d]), suffix, &vt);app.auto.add(&format!("{base}.value.{d}"), vr, &pr.name);if let Some(nv) = nv {let mut nc = c.clone();diff --cc crates/ui-egui/src/panels/timeline.rsindex 88bd81eef,238071bda..a119109ad--- a/crates/ui-egui/src/panels/timeline.rs+++ b/crates/ui-egui/src/panels/timeline.rs@@@ -4015,15 -4344,17 +4346,17 @@@ fn value_editor_ => (-1e9, 1e9, 1, 1.0),};if matches!(prop.ui, ParamUi::Angle) {- let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(x, y), egui::Id::new(("v", uid, 0)), *v, 1, &vt);- let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(x, y), egui::Id::unique(("v", uid, 0)), *v, 1, &t);++ let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(x, y), egui::Id::unique(("v", uid, 0)), *v, 1, &vt);app.auto.add(&format!("timeline.prop.{uid}.value"), dr, &prop.name);app.auto.add(&format!("timeline.prop.{uid}.revolutions"), rr, &prop.name);if let Some(nv) = nv {set(actions, json!(nv));}} else {- let suffix = if matches!(prop.ui, ParamUi::Percent) || prop.match_id == "opacity" { "%" } else { "" };- let (r, nv, _) = widgets::hot_number_at(ui, pos2(x, y), egui::Id::new(("v", uid, 0)), *v, speed, (min, max), dec.max(1), suffix, &vt);+ // A Range Selector's Start, End and Offset count characters with Units = Index (#1814).+ let pct = (matches!(prop.ui, ParamUi::Percent) || prop.match_id == "opacity") && !effectcraft_engine::render::text::in_index_units(layer, uid);+ let suffix = if pct { "%" } else { "" };- let (r, nv, _) = widgets::hot_number_at(ui, pos2(x, y), egui::Id::unique(("v", uid, 0)), *v, speed, (min, max), dec.max(1), suffix, &t);++ let (r, nv, _) = widgets::hot_number_at(ui, pos2(x, y), egui::Id::unique(("v", uid, 0)), *v, speed, (min, max), dec.max(1), suffix, &vt);app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);if let Some(nv) = nv {set(actions, json!(nv));@@@ -4052,7 -4383,8 +4385,8 @@@}for d in 0..n.min(c.len()) {let suffix = if pct && d + 1 == n { "%" } else { "" };- let (r, nv, _) = widgets::hot_number_at(ui, pos2(x, y), egui::Id::new(("v", uid, d)), c[d], if pct { 0.5 } else { 1.0 }, range, 1, suffix, &vt);+ let (r, nv, _) =- widgets::hot_number_at(ui, pos2(x, y), egui::Id::unique(("v", uid, d)), c[d], if pct { 0.5 } else { 1.0 }, range, 1, suffix, &t);++ widgets::hot_number_at(ui, pos2(x, y), egui::Id::unique(("v", uid, d)), c[d], if pct { 0.5 } else { 1.0 }, range, 1, suffix, &vt);app.auto.add(&format!("timeline.prop.{uid}.value.{d}"), r, &prop.name);dims.push(r);if let Some(nv) = nv {diff --cc crates/ui-egui/tests/it/main.rsindex 000000000,b5492c1b5..ecb931d53mode 000000,100644..100644--- a/crates/ui-egui/tests/it/main.rs+++ b/crates/ui-egui/tests/it/main.rs@@@ -1,0 -1,104 +1,105 @@@+ //! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).++ mod render_queue_snapshot;+ mod shared_docking_ui;+ mod ui_3d;+ mod ui_agent_audit;+ mod ui_angles;+ mod ui_audio_scrub;+ mod ui_azerty_shortcuts;+ mod ui_batch_switches;+ mod ui_blank_context_menus;+ mod ui_camera_tracker;+ mod ui_character_eyedropper;+ mod ui_color_hex;+ mod ui_comp_presets;+ mod ui_control_modifiers;+ mod ui_dock_resize;+ mod ui_drag_drop;+ mod ui_effect_controls;+ mod ui_effect_drop_highlight;+ mod ui_effect_names;++mod ui_expression_values;+ mod ui_font_search;+ mod ui_form_fit;+ mod ui_frame_step;+ mod ui_fx_editors;+ mod ui_gpu;+ mod ui_gradient_editor;+ mod ui_gradient_handles;+ mod ui_gradient_value;+ mod ui_graph_fit;+ mod ui_group_rename;+ mod ui_guide_layers;+ mod ui_inline_edit;+ mod ui_keyframes;+ mod ui_large_project;+ mod ui_layer_panel_zoom;+ mod ui_layer_source_picker;+ mod ui_light_settings;+ mod ui_live_preview;+ mod ui_locked_color;+ mod ui_media_browser_cache;+ mod ui_media_browser_copy_path;+ mod ui_menus;+ mod ui_new_primitive;+ mod ui_object_matte;+ mod ui_panel_focus;+ mod ui_panel_windows;+ mod ui_panels;+ mod ui_parameter_spacing;+ mod ui_presets_folder;+ mod ui_preview_align;+ mod ui_project_delete;+ mod ui_project_duplicate;+ mod ui_project_keyboard;+ mod ui_project_new_folder;+ mod ui_project_rows;+ mod ui_quick_offset;+ mod ui_ram_preview;+ mod ui_render_queue;+ mod ui_script_console;+ mod ui_scriptui;+ mod ui_scrolling;+ mod ui_settings_info;+ mod ui_tabs;+ mod ui_tail;+ mod ui_text_edit;+ mod ui_text_range_handles;+ mod ui_theme_favorites;+ mod ui_time_zoom_controls;+ mod ui_timeline_effect_label;+ mod ui_timeline_pan;+ mod ui_timeline_shapes;+ mod ui_timeline_switches;+ mod ui_timeline_trim;+ mod ui_timeline_zoom;+ mod ui_toolbar_gradient;+ mod ui_tracker;+ mod ui_unreadable_footage;+ mod ui_video_preview_off;+ mod ui_viewer;+ mod ui_viewers;+ mod ui_visual_review;+ mod ui_web_gpu_storage;+ mod ui_web_job_gpu;+ mod ui_web_offload;+ mod ui_workflow_selection;+ mod ui_workspace_focus;+ mod viewer_geometry;+ mod viewer_passive_display;++ /// Register the managed build's canonical craft-fonts checkout (`CRAFT_FONTS_DIR/fonts`) through+ /// the same directory source production scans for `EFFECTCRAFT_FONT_DIRS`. The UI tests then render+ /// real Japanese glyphs from the canonical external input instead of relying on host fonts.+ pub(crate) fn add_canonical_test_fonts() {+ use effectcraft_text::fonts::{self, DirectorySource};+ static REGISTER: std::sync::Once = std::sync::Once::new();+ REGISTER.call_once(|| {+ let Some(root) = std::env::var_os("CRAFT_FONTS_DIR") else { return };+ let dir = std::path::PathBuf::from(root).join("fonts");+ if dir.is_dir() {+ fonts::add_source(&DirectorySource { dirs: vec![dir] });+ }+ });+ }diff --cc crates/ui-egui/tests/it/ui_expression_values.rsindex b797e6cf6,000000000..b797e6cf6mode 100644,000000..100644--- a/crates/ui-egui/tests/it/ui_expression_values.rs+++ b/crates/ui-egui/tests/it/ui_expression_values.rs