Skip to content

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

Merge main into enhance/avi-import

tylerjenningswd2ae0bd50346
diff --cc crates/ui-egui/src/menus.rs
index eda7ccf7e,92893dcb6..d727d6bfd
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@@ -1368,7 -1396,9 +1398,7 @@@ fn file_dialog(app: &mut EffectcraftApp
"keys.rpfCameraImport" => ("path", Ask::Open(&["json", "csv", "txt"])),
"essential.exportTemplate" => ("path", Ask::Save("Template.ectemplate")),
"essential.importTemplate" => ("path", Ask::Open(&["ectemplate"])),
- "file.setProxy" => ("path", Ask::OpenFootage(&["png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "exr"])),
- "file.setProxy" => {
- ("path", Ask::Open(&["mp4", "mov", "m4v", "mkv", "webm", "mxf", "png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "tga", "exr"]))
- }
++ "file.setProxy" => ("path", Ask::OpenFootage(&["png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "tga", "exr"])),
_ => return None,
};
if params.get(key).is_some()
@@@ -1379,15 -1409,15 +1409,17 @@@
{
return None;
}
+ // Importable files besides movies.
const MEDIA: &[&str] = &[
- "mp4", "mov", "m4v", "mkv", "webm", "mxf", "png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "exr", "dpx", "cin", "wav", "aif", "aiff", "mp3",
- "flac", "ogg", "opus", "svg", "pdf", "ai", "eps", "psd", "psb", "tga", "hdr", "gltf", "glb", "obj", "stl", "fbx", "json", "csv", "tsv",
+ "png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "exr", "dpx", "cin", "wav", "aif", "aiff", "mp3", "flac", "ogg", "opus", "svg", "pdf", "ai",
+ "eps", "psd", "psb", "tga", "hdr", "gltf", "glb", "obj", "stl", "fbx", "json", "csv", "tsv",
];
+ let footage = |more: &[&'static str]| effectcraft_project::VIDEO_EXTENSIONS.iter().chain(more).copied().collect::<Vec<_>>();
- // A host whose modal dialogs would run a nested event loop inside this frame (macOS: a
- // drag over the window then re-entered winit's event handler and aborted, #511) shows the
- // dialog without blocking; the command continues when the answer arrives.
+ // A host whose blocking dialogs are unsafe inside this frame shows the dialog without
+ // blocking — macOS: the nested event loop re-entered winit's handler on a drag over the
+ // window and aborted the app (#511); Linux: the desktop portal's answer never gets pumped,
+ // so the compositor marks the window as not responding (#1275) — and the command continues
+ // when the answer arrives.
if let Some(spawn) = app.hooks.file_dialog_async.as_ref() {
let request = match ask {
Ask::Folder => crate::FileDialog::Folder,