LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge main into fix/issue-24-hide-local-locations
Brandon Thomas5b73e4f08b9c
diff --cc crates/ui-egui/src/panels/left.rsindex a56eb275f,cf89b9dac..725163226--- a/crates/ui-egui/src/panels/left.rs+++ b/crates/ui-egui/src/panels/left.rs@@@ -182,25 -213,29 +213,33 @@@ fn local_section(app: &mut LightcraftAp}}let browsing = app.session.browse.clone().filter(|_| app.session.source == LibrarySource::Folder);- if let Some(b) = &browsing- && !places.iter().any(|(_, p)| *p == b.path)- {- let name = std::path::Path::new(&b.path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| b.path.clone());- places.push((name, b.path.clone()));+ // picked folders stay listed; the folder being browsed is listed even when it wasn't picked+ let roots = app.ui.local_roots.iter().cloned().chain(browsing.iter().map(|b| b.path.clone()));+ for path in roots {+ if !places.iter().any(|(_, p)| *p == path) {+ let name = std::path::Path::new(&path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| path.clone());+ places.push((name, path));+ }}let current = browsing.as_ref().map(|b| b.path.clone());+ // hidden locations stay reachable: breadcrumbs, Browse Folder…, and the row below+ places.retain(|(_, p)| !app.ui.hidden_locations.contains(p));for (name, path) in places {folder_tree(app, ui, &name, &path, 0.0, current.as_deref());}if app.services.pick_folder.is_some() && row(app, ui, "local:browse", Icon::Plus, "Browse Folder…", None, false, 0.0).clicked() {let picked = app.services.pick_folder.as_mut().and_then(|f| f());if let Some(path) = picked {+ // choosing a folder again puts it back in the list+ let _ = app.run("local.restoreHidden", json!({"path": path}));- if let Err(e) = app.run("library.browse", json!({"path": path})) {- app.toast(ui.ctx(), e);+ match app.run("library.browse", json!({"path": path})) {+ Ok(r) => {+ let dir = r["path"].as_str().unwrap_or(&path).to_string();+ if !app.ui.local_roots.contains(&dir) {+ app.ui.local_roots.push(dir);+ }+ }+ Err(e) => app.toast(ui.ctx(), e),}}}