EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge remote-tracking branch 'origin/main' into jp/ja-dialogs
midasdf6b824def1a77
diff --cc crates/ui-egui/src/panels/graph.rsindex 076ad725b,fa082040c..9807df00e--- a/crates/ui-egui/src/panels/graph.rs+++ b/crates/ui-egui/src/panels/graph.rs@@@ -254,7 -252,7 +254,7 @@@ fn text_buttonreturn bar.chosen.as_deref() == Some(id);}let r = Rect::from_min_size(pos2(bar.x, y - 9.0), vec2(w, 18.0));- let resp = ui.interact(r, egui::Id::new(("graph-btn", id)), Sense::click()).on_hover_text(shown_tip);- let resp = ui.interact(r, egui::Id::unique(("graph-btn", id)), Sense::click()).on_hover_text(tip);++ let resp = ui.interact(r, egui::Id::unique(("graph-btn", id)), Sense::click()).on_hover_text(shown_tip);p.rect_filled(r,3.0,diff --cc crates/ui-egui/src/panels/misc.rsindex 95e27da93,b0ec5e570..6855f8fda--- a/crates/ui-egui/src/panels/misc.rs+++ b/crates/ui-egui/src/panels/misc.rs@@@ -42,8 -42,7 +42,10 @@@ pub fn preview(app: &mut EffectcraftAppfor (icon, cmd, tip) in buttons {let r = Rect::from_min_size(pos2(x, y), vec2(bw, 28.0));let icon = if cmd == "playback.toggle" && app.playback.playing { Icon::Pause } else { icon };- if widgets::icon_button(ui, r, icon, cmd == "playback.toggle" && app.playback.playing, &t, egui::Id::new(("pv", cmd))).on_hover_text(tr(tip)).clicked()- if widgets::icon_button(ui, r, icon, cmd == "playback.toggle" && app.playback.playing, &t, egui::Id::unique(("pv", cmd))).on_hover_text(tip).clicked() {++ if widgets::icon_button(ui, r, icon, cmd == "playback.toggle" && app.playback.playing, &t, egui::Id::unique(("pv", cmd)))++ .on_hover_text(tr(tip))++ .clicked()+ {// The play button plays with the options of the shortcut shown below.let params = if cmd == "playback.toggle" { json!({"shortcut": current.id()}) } else { json!({}) };let _ = crate::menus::invoke(app, &ctx, cmd, params);diff --cc crates/ui-egui/src/panels/project.rsindex 5fdc76959,a18fe1966..bd7d40947--- a/crates/ui-egui/src/panels/project.rs+++ b/crates/ui-egui/src/panels/project.rs@@@ -1019,9 -1032,9 +1032,9 @@@ pub fn show(app: &mut EffectcraftApp, u(Icon::NewComp, "newComp", "Create a new Composition"),] {let r = Rect::from_min_size(pos2(x, foot.min.y + 3.0), vec2(22.0, 22.0));- let resp = widgets::icon_button(ui, r, icon, false, &t, egui::Id::new(("pfoot", id))).on_hover_text(crate::i18n::tr(tip));- let resp = widgets::icon_button(ui, r, icon, false, &t, egui::Id::unique(("pfoot", id))).on_hover_text(tip);++ let resp = widgets::icon_button(ui, r, icon, false, &t, egui::Id::unique(("pfoot", id))).on_hover_text(crate::i18n::tr(tip));app.auto.add(&format!("project.{id}"), r, tip);- resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, crate::i18n::tr(tip)));+ resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, crate::i18n::tr(tip)));if resp.clicked() {let footage =app.session.state.project_selection.first().and_then(|i| app.session.project.item(*i)).is_some_and(|i| matches!(i.kind, ItemKind::Footage(_)));