Skip to content

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

Update prompt shows the app icon: UPDATE_APP carries the 128 px icon

Dylan M. Taylordd039114427d
diff --git a/apps/effectcraft/src/main.rs b/apps/effectcraft/src/main.rs
index 452196224..138f10882 100644
--- a/apps/effectcraft/src/main.rs
+++ b/apps/effectcraft/src/main.rs
@@ -155,7 +155,7 @@ fn install_file_dialogs(app: &mut EffectcraftApp) -> Option<std::sync::mpsc::Rec
fn main() -> eframe::Result {
// Windows: the update helper is a copy of this program started with `--finish-update`.
#[cfg(windows)]
- if let Some(result) = craft_update::self_update::finish(&craft_update::suite::EFFECTCRAFT, &std::env::args_os().skip(1).collect::<Vec<_>>()) {
+ if let Some(result) = craft_update::self_update::finish(&effectcraft_ui_egui::UPDATE_APP, &std::env::args_os().skip(1).collect::<Vec<_>>()) {
std::process::exit(i32::from(result.is_err()));
}
// First, so the panic hook and every start-up warning are recorded. Records go to stderr
diff --git a/crates/gpu/src/tests/wgsl_grammar.rs b/crates/gpu/src/tests/wgsl_grammar.rs
index d68a12ac4..dfb75b5a5 100644
--- a/crates/gpu/src/tests/wgsl_grammar.rs
+++ b/crates/gpu/src/tests/wgsl_grammar.rs
@@ -182,10 +182,8 @@ fn violations(src: &str) -> Vec<(usize, String)> {
let tok = next_token(&s, &mut i);
match tok {
Tok::Open => levels.push(vec![]),
- Tok::Close => {
- if levels.len() > 1 {
- levels.pop();
- }
+ Tok::Close if levels.len() > 1 => {
+ levels.pop();
}
Tok::Sep => {
if let Some(l) = levels.last_mut() {
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 0b259bfde..d15e0210e 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -7,6 +7,13 @@
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
+/// EffectCraft as craft-update knows it, with its 128 px icon: the update prompt shows the icon,
+/// and an AppImage's menu entry gets it.
+pub const UPDATE_APP: craft_update::app::App = craft_update::app::App {
+ icon_png: Some(include_bytes!("../../../assets/app-icon/hicolor/128x128/apps/ai.storyteller.effectcraft.png")),
+ ..craft_update::suite::EFFECTCRAFT
+};
+
pub mod audio;
pub mod automation;
pub mod bench;
diff --git a/crates/ui-egui/src/updates_ui.rs b/crates/ui-egui/src/updates_ui.rs
index 0101e16ae..3530a9efb 100644
--- a/crates/ui-egui/src/updates_ui.rs
+++ b/crates/ui-egui/src/updates_ui.rs
@@ -21,7 +21,7 @@ impl Default for Runtime {
fn default() -> Self {
Self {
#[cfg(not(target_arch = "wasm32"))]
- updater: Updater::new(&craft_update::suite::EFFECTCRAFT, env!("CARGO_PKG_VERSION")),
+ updater: Updater::new(&crate::UPDATE_APP, env!("CARGO_PKG_VERSION")),
#[cfg(not(target_arch = "wasm32"))]
startup_check: false,
#[cfg(not(target_arch = "wasm32"))]