RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:17:44 +00:00
Code Issues Activity Actions

FileManager: Fix TreeView collapsing on file system changes (#4348)

Browse source 
TreeViews using FileSystemModels collapse whenever the file system is
changed in anyway. This includes creating, dragging, deleting or
pasting any files/folders. This commit updates the refresh_tree_view()
lambda, which seems to have stopped working at some point, and calls it
whenever any of the actions mentioned above are activated.
This commit is contained in:
Zac 2020-12-09 03:51:53 +11:00 • committed by GitHub
parent 6496895b16
commit eb810d14c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Applications/FileManager/DirectoryView.cpp
View file

@ -563,6 +563,7 @@ void DirectoryView::handle_drop(const GUI::ModelIndex& index, const GUI::DropEve
if (!target_node.is_directory()) if (!target_node.is_directory())
return; return;
bool had_accepted_drop = false;
for (auto& url_to_copy : urls) { for (auto& url_to_copy : urls) {
if (!url_to_copy.is_valid() || url_to_copy.path() == target_node.full_path()) if (!url_to_copy.is_valid() || url_to_copy.path() == target_node.full_path())
continue; continue;
@ -573,8 +574,12 @@ void DirectoryView::handle_drop(const GUI::ModelIndex& index, const GUI::DropEve
if (!FileUtils::copy_file_or_directory(url_to_copy.path(), new_path)) { if (!FileUtils::copy_file_or_directory(url_to_copy.path(), new_path)) {
auto error_message = String::formatted("Could not copy {} into {}.", url_to_copy.to_string(), new_path); auto error_message = String::formatted("Could not copy {} into {}.", url_to_copy.to_string(), new_path);
GUI::MessageBox::show(window(), error_message, "File Manager", GUI::MessageBox::Type::Error); GUI::MessageBox::show(window(), error_message, "File Manager", GUI::MessageBox::Type::Error);
} else {
had_accepted_drop = true;
} }
} }
}; if (had_accepted_drop)
on_accepted_drop();
}
} }

1
Applications/FileManager/DirectoryView.h
View file

@ -86,6 +86,7 @@ public:
Function<void(const GUI::ModelIndex&, const GUI::ContextMenuEvent&)> on_context_menu_request; Function<void(const GUI::ModelIndex&, const GUI::ContextMenuEvent&)> on_context_menu_request;
Function<void(const StringView&)> on_status_message; Function<void(const StringView&)> on_status_message;
Function<void(int done, int total)> on_thumbnail_progress; Function<void(int done, int total)> on_thumbnail_progress;
Function<void()> on_accepted_drop;
enum ViewMode { enum ViewMode {
Invalid, Invalid,

42
Applications/FileManager/main.cpp
View file

@ -218,7 +218,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
tree_view.set_column_hidden(GUI::FileSystemModel::Column::Inode, true); tree_view.set_column_hidden(GUI::FileSystemModel::Column::Inode, true);
tree_view.set_column_hidden(GUI::FileSystemModel::Column::SymlinkTarget, true); tree_view.set_column_hidden(GUI::FileSystemModel::Column::SymlinkTarget, true);
tree_view.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); tree_view.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
tree_view.set_preferred_size(150, 0); tree_view.set_preferred_size(175, 0);
bool is_reacting_to_tree_view_selection_change = false; bool is_reacting_to_tree_view_selection_change = false;
auto& directory_view = splitter.add<DirectoryView>(DirectoryView::Mode::Normal); auto& directory_view = splitter.add<DirectoryView>(DirectoryView::Mode::Normal);
@ -257,9 +257,10 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
// Reselect the existing folder in the tree. // Reselect the existing folder in the tree.
auto new_index = directories_model->index(current_path, GUI::FileSystemModel::Column::Name); auto new_index = directories_model->index(current_path, GUI::FileSystemModel::Column::Name);
tree_view.selection().set(new_index); if (new_index.is_valid()) {
tree_view.scroll_into_view(new_index, false, true); tree_view.expand_all_parents_of(new_index);
tree_view.update(); tree_view.set_cursor(new_index, GUI::AbstractView::SelectionUpdate::Set, true);
}
directory_view.refresh(); directory_view.refresh();
}; };
@ -442,6 +443,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
auto tree_view_delete_action = GUI::CommonActions::make_delete_action( auto tree_view_delete_action = GUI::CommonActions::make_delete_action(
[&](auto&) { [&](auto&) {
FileUtils::delete_paths(tree_view_selected_file_paths(), true, window); FileUtils::delete_paths(tree_view_selected_file_paths(), true, window);
refresh_tree_view();
}, },
&tree_view); &tree_view);
@ -452,13 +454,24 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
tree_view_delete_action->activate(); tree_view_delete_action->activate();
else else
directory_view.delete_action().activate(); directory_view.delete_action().activate();
refresh_tree_view();
});
auto mkdir_action = GUI::Action::create("New directory...", { Mod_Ctrl | Mod_Shift, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/mkdir.png"), [&](const GUI::Action&) {
directory_view.mkdir_action().activate();
refresh_tree_view();
});
auto touch_action = GUI::Action::create("New file...", { Mod_Ctrl | Mod_Shift, Key_F }, Gfx::Bitmap::load_from_file("/res/icons/16x16/new.png"), [&](const GUI::Action&) {
directory_view.touch_action().activate();
refresh_tree_view();
}); });
auto menubar = GUI::MenuBar::construct(); auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("File Manager"); auto& app_menu = menubar->add_menu("File Manager");
app_menu.add_action(directory_view.mkdir_action()); app_menu.add_action(mkdir_action);
app_menu.add_action(directory_view.touch_action()); app_menu.add_action(touch_action);
app_menu.add_action(copy_action); app_menu.add_action(copy_action);
app_menu.add_action(paste_action); app_menu.add_action(paste_action);
app_menu.add_action(focus_dependent_delete_action); app_menu.add_action(focus_dependent_delete_action);
@ -472,6 +485,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
auto action_show_dotfiles = GUI::Action::create_checkable("Show dotfiles", { Mod_Ctrl, Key_H }, [&](auto& action) { auto action_show_dotfiles = GUI::Action::create_checkable("Show dotfiles", { Mod_Ctrl, Key_H }, [&](auto& action) {
directory_view.set_should_show_dotfiles(action.is_checked()); directory_view.set_should_show_dotfiles(action.is_checked());
refresh_tree_view();
}); });
auto& view_menu = menubar->add_menu("View"); auto& view_menu = menubar->add_menu("View");
@ -505,8 +519,8 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
main_toolbar.add_action(go_home_action); main_toolbar.add_action(go_home_action);
main_toolbar.add_separator(); main_toolbar.add_separator();
main_toolbar.add_action(directory_view.mkdir_action()); main_toolbar.add_action(mkdir_action);
main_toolbar.add_action(directory_view.touch_action()); main_toolbar.add_action(touch_action);
main_toolbar.add_action(copy_action); main_toolbar.add_action(copy_action);
main_toolbar.add_action(paste_action); main_toolbar.add_action(paste_action);
main_toolbar.add_action(focus_dependent_delete_action); main_toolbar.add_action(focus_dependent_delete_action);
@ -546,6 +560,10 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
open_parent_directory_action->set_enabled(new_path != "/"); open_parent_directory_action->set_enabled(new_path != "/");
}; };
directory_view.on_accepted_drop = [&]() {
refresh_tree_view();
};
directory_view.on_status_message = [&](const StringView& message) { directory_view.on_status_message = [&](const StringView& message) {
statusbar.set_text(message); statusbar.set_text(message);
}; };
@ -572,8 +590,8 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
directory_context_menu->add_separator(); directory_context_menu->add_separator();
directory_context_menu->add_action(properties_action); directory_context_menu->add_action(properties_action);
directory_view_context_menu->add_action(directory_view.mkdir_action()); directory_view_context_menu->add_action(mkdir_action);
directory_view_context_menu->add_action(directory_view.touch_action()); directory_view_context_menu->add_action(touch_action);
directory_view_context_menu->add_action(paste_action); directory_view_context_menu->add_action(paste_action);
directory_view_context_menu->add_action(directory_view.open_terminal_action()); directory_view_context_menu->add_action(directory_view.open_terminal_action());
directory_view_context_menu->add_separator(); directory_view_context_menu->add_separator();
@ -587,8 +605,8 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
tree_view_directory_context_menu->add_separator(); tree_view_directory_context_menu->add_separator();
tree_view_directory_context_menu->add_action(properties_action); tree_view_directory_context_menu->add_action(properties_action);
tree_view_directory_context_menu->add_separator(); tree_view_directory_context_menu->add_separator();
tree_view_directory_context_menu->add_action(directory_view.mkdir_action()); tree_view_directory_context_menu->add_action(mkdir_action);
tree_view_directory_context_menu->add_action(directory_view.touch_action()); tree_view_directory_context_menu->add_action(touch_action);
RefPtr<GUI::Menu> file_context_menu; RefPtr<GUI::Menu> file_context_menu;
NonnullRefPtrVector<LauncherHandler> current_file_handlers; NonnullRefPtrVector<LauncherHandler> current_file_handlers;