diff --git a/crates/ui-egui/src/file_browser.rs b/crates/ui-egui/src/file_browser.rs
index 897db5b3a9..48b79efed8 100644
--- a/crates/ui-egui/src/file_browser.rs
+++ b/crates/ui-egui/src/file_browser.rs
@@ -144,6 +144,8 @@ pub(crate) struct FileBrowser {
listing: Result
,
/// The highlighted entry.
selected: Option,
+ /// The highlighted entry was a folder when it was selected.
+ selected_is_dir: bool,
note: Note,
focus_name: bool,
}
@@ -182,6 +184,7 @@ impl FileBrowser {
exports,
listing: Ok(Listing::default()),
selected: None,
+ selected_is_dir: false,
note: Note::None,
focus_name: true,
};
@@ -199,6 +202,7 @@ impl FileBrowser {
self.location = dir.to_string_lossy().into_owned();
self.dir = dir;
self.selected = None;
+ self.selected_is_dir = false;
self.note = Note::None;
}
@@ -222,11 +226,13 @@ impl FileBrowser {
/// pick. Save adds the chosen type's extension to a name without one (an export replaces a
/// known document extension with the type's) and asks once more before replacing a file; Open wants a file that exists.
pub(crate) fn accept(&mut self) -> Step {
- if let Some(dir) = self.selected.take().filter(|p| p.is_dir()) {
+ if let Some(dir) = self.selected.clone().filter(|p| p.is_dir()) {
self.navigate(dir);
return Step::Stay;
}
- let Some(mut path) = resolve(&self.dir, &self.name) else { return Step::Stay };
+ // A removed folder remains a folder selection, not a proposed file name.
+ let selected_file = self.selected.clone().filter(|_| !self.selected_is_dir);
+ let Some(mut path) = selected_file.or_else(|| resolve(&self.dir, &self.name)) else { return Step::Stay };
if path.is_dir() {
self.name.clear();
self.navigate(path);
@@ -262,6 +268,7 @@ impl FileBrowser {
/// A click on an entry: highlight it, and a file's name goes into the file name field.
fn select(&mut self, e: &Entry) {
self.selected = Some(e.path.clone());
+ self.selected_is_dir = e.dir;
if !e.dir {
self.name = e.name.clone();
}
@@ -490,6 +497,7 @@ fn body(ui: &mut Ui, b: &mut FileBrowser, t: &Tokens) -> Option