RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:47:34 +00:00
Code Issues Activity Actions

FileManager: Check which widget has focus for context menu actions

Browse source 
This fixes the issue where application shortcuts only operated on the
TreeView.
This commit is contained in:
Tommy Nguyen 2019-12-12 17:15:17 -05:00 • committed by Andreas Kling
parent 9150be4716
commit 091c783626
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Applications/FileManager/main.cpp
View file

@ -192,7 +192,7 @@ int main(int argc, char** argv)
auto copy_action = GCommonActions::make_copy_action([&](const GAction& action) { auto copy_action = GCommonActions::make_copy_action([&](const GAction& action) {
Vector<String> paths; Vector<String> paths;
if (action.activator() == directory_context_menu) { if (action.activator() == directory_context_menu || directory_view->active_widget()->is_focused()) {
paths = selected_file_paths(); paths = selected_file_paths();
} else { } else {
paths = tree_view_selected_file_paths(); paths = tree_view_selected_file_paths();
@ -245,7 +245,7 @@ int main(int argc, char** argv)
auto& model = directory_view->model(); auto& model = directory_view->model();
String path; String path;
Vector<String> selected; Vector<String> selected;
if (action.activator() == directory_context_menu) { if (action.activator() == directory_context_menu || directory_view->active_widget()->is_focused()) {
path = directory_view->path(); path = directory_view->path();
selected = selected_file_paths(); selected = selected_file_paths();
} else { } else {
@ -267,7 +267,7 @@ int main(int argc, char** argv)
auto do_delete = [&](ConfirmBeforeDelete confirm, const GAction& action) { auto do_delete = [&](ConfirmBeforeDelete confirm, const GAction& action) {
Vector<String> paths; Vector<String> paths;
if (action.activator() == directory_context_menu) { if (action.activator() == directory_context_menu || directory_view->active_widget()->is_focused()) {
paths = selected_file_paths(); paths = selected_file_paths();
} else { } else {
paths = tree_view_selected_file_paths(); paths = tree_view_selected_file_paths();