Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Integration: #2977 drop unrelated native_menu and compare panel hunks

aiongg87fccf0b139b
diff --git a/apps/lightcraft/src/native_menu.rs b/apps/lightcraft/src/native_menu.rs
index d43511457..d25b56566 100644
--- a/apps/lightcraft/src/native_menu.rs
+++ b/apps/lightcraft/src/native_menu.rs
@@ -497,7 +497,9 @@ impl NativeMenu {
// events never reach `shortcuts::handle`, so this is the one guard for AppKit's
// accelerators and clicks: while the blocking library window or a quit/settings notice
// owns input, a queued command is dropped (Quit stays for the existing confirmation).
- let (cmd, params) = if key == QUIT || key == "app.about" || key == SETTINGS {
+ let (cmd, params) = if key == QUIT {
+ (key, serde_json::json!({}))
+ } else if key == "app.about" || key == SETTINGS {
(key, serde_json::json!({}))
} else if let Some(it) = self.items.get(&key) {
(it.cmd.clone(), it.params.clone())
diff --git a/crates/ui-egui/src/panels/compare.rs b/crates/ui-egui/src/panels/compare.rs
index 6103491e1..9b9a23673 100644
--- a/crates/ui-egui/src/panels/compare.rs
+++ b/crates/ui-egui/src/panels/compare.rs
@@ -606,12 +606,7 @@ pub fn show_reference(app: &mut LightcraftApp, ui: &mut egui::Ui) {
let canvas = area_and_filmstrip(app, ui);
let reference = app.ui.reference.map(PhotoId).filter(|r| live(app, *r));
let (Some(r), Some(active)) = (reference, app.session.active()) else {
- super::empty_message(
- ui,
- canvas,
- "No reference photo",
- "Right-click a photo and choose Set as Reference Photo, then View → Reference View (Shift+R)",
- );
+ super::empty_message(ui, canvas, "No reference photo", "Right-click a photo ▸ Set as Reference Photo, then View → Reference View (Shift+R)");
return;
};
let area = canvas.shrink(18.0);