Skip to content

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

Merge main into fix/issue-23-local-folder-async

Brandon Thomas94fd0e69949e
diff --cc crates/ui-egui/src/panels/grid.rs
index 060bb620c,53749bb6b..5af5fa46e
--- a/crates/ui-egui/src/panels/grid.rs
+++ b/crates/ui-egui/src/panels/grid.rs
@@@ -46,15 -50,16 +50,21 @@@ pub fn show(app: &mut LightcraftApp, ui
}
app.canvas_rect = Some(ui.max_rect());
if ids.is_empty() {
- if app.session.filter != Default::default() {
+ if !chips.is_empty() {
+ let body = match total {
+ Some(n) if n > 0 => format!("{n} photos in {} are hidden by the filters above", app.session.source.label(&app.session.catalog)),
+ _ => "Remove a filter above, or choose Clear all".to_string(),
+ };
+ super::empty_message(ui, ui.max_rect(), "No photos match the active filters", &body);
++ } else if app.session.filter != Default::default() {
+ super::empty_message(
+ ui,
+ ui.max_rect(),
+ "No matching photos",
+ "A filter is hiding this view's photos: change it, or clear it (View → Clear Filters)",
+ );
} else if app.session.source == lightcraft_engine::LibrarySource::Folder {
super::empty_message(ui, ui.max_rect(), "No photos in this folder", "Turn on Include subfolders, or pick another folder under Local");
- } else if app.session.filter != Default::default() {
- super::empty_message(ui, ui.max_rect(), "No matching photos", "Change the filter, or clear it (View → Clear Filters)");
} else {
super::empty_message(ui, ui.max_rect(), "No photos", "Add photos with File → Add Photos (Cmd+Shift+I), or drop them here");
}