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

FileManager: Don't pass DirectoryView subview to hooks that don't care

Browse source
This commit is contained in:
Andreas Kling 2020-08-17 19:58:42 +02:00
parent 0083fe0118
commit 66cedfa13b
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Applications/FileManager/DirectoryView.cpp
View file

@ -195,11 +195,11 @@ void DirectoryView::setup_icon_view()
};
m_icon_view->on_context_menu_request = [this](auto& index, auto& event) {
if (on_context_menu_request)
on_context_menu_request(*m_icon_view, map_index(index), event);
on_context_menu_request(map_index(index), event);
};
m_icon_view->on_drop = [this](auto& index, auto& event) {
if (on_drop)
on_drop(*m_icon_view, map_index(index), event);
on_drop(map_index(index), event);
};
}
@ -221,12 +221,12 @@ void DirectoryView::setup_columns_view()
m_columns_view->on_context_menu_request = [this](auto& index, auto& event) {
if (on_context_menu_request)
on_context_menu_request(*m_columns_view, map_index(index), event);
on_context_menu_request(map_index(index), event);
};
m_columns_view->on_drop = [this](auto& index, auto& event) {
if (on_drop)
on_drop(*m_columns_view, map_index(index), event);
on_drop(map_index(index), event);
};
}
@ -249,12 +249,12 @@ void DirectoryView::setup_table_view()
m_table_view->on_context_menu_request = [this](auto& index, auto& event) {
if (on_context_menu_request)
on_context_menu_request(*m_table_view, map_index(index), event);
on_context_menu_request(map_index(index), event);
};
m_table_view->on_drop = [this](auto& index, auto& event) {
if (on_drop)
on_drop(*m_table_view, map_index(index), event);
on_drop(map_index(index), event);
};
}

4
Applications/FileManager/DirectoryView.h
View file

@ -81,8 +81,8 @@ public:
Function<void(const StringView&)> on_path_change;
Function<void(GUI::AbstractView&)> on_selection_change;
Function<void(const GUI::AbstractView&, const GUI::ModelIndex&, const GUI::ContextMenuEvent&)> on_context_menu_request;
Function<void(const GUI::AbstractView&, const GUI::ModelIndex&, const GUI::DropEvent&)> on_drop;
Function<void(const GUI::ModelIndex&, const GUI::ContextMenuEvent&)> on_context_menu_request;
Function<void(const GUI::ModelIndex&, const GUI::DropEvent&)> on_drop;
Function<void(const StringView&)> on_status_message;
Function<void(int done, int total)> on_thumbnail_progress;
Function<void(int error, const char* error_string, bool quit)> on_error;

4
Applications/FileManager/main.cpp
View file

@ -747,7 +747,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
NonnullRefPtrVector<LauncherHandler> current_file_handlers;
RefPtr<GUI::Action> file_context_menu_action_default_action;
directory_view.on_context_menu_request = [&](const GUI::AbstractView&, const GUI::ModelIndex& index, const GUI::ContextMenuEvent& event) {
directory_view.on_context_menu_request = [&](const GUI::ModelIndex& index, const GUI::ContextMenuEvent& event) {
if (index.is_valid()) {
auto& node = directory_view.model().node(index);
@ -807,7 +807,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
}
};
directory_view.on_drop = [&](const GUI::AbstractView&, const GUI::ModelIndex& index, const GUI::DropEvent& event) {
directory_view.on_drop = [&](const GUI::ModelIndex& index, const GUI::DropEvent& event) {
if (!event.mime_data().has_urls())
return;
auto urls = event.mime_data().urls();