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

FileManager: Use one SortingProxyModel for all DirectoryView subviews

Browse source 
This removes one major source of confusion in DirectoryView. It's still
weird that we mix sorting model indexes with filesystem model indexes
a bit willy-nilly but we'll improve that separately.
This commit is contained in:
Andreas Kling 2020-08-15 20:05:57 +02:00
parent 8c8281de4e
commit 7b110fad56
2 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Applications/FileManager/DirectoryView.cpp
View file

@ -114,17 +114,18 @@ void DirectoryView::handle_activation(const GUI::ModelIndex& index)
DirectoryView::DirectoryView() DirectoryView::DirectoryView()
: m_model(GUI::FileSystemModel::create()) : m_model(GUI::FileSystemModel::create())
, m_sorting_model(GUI::SortingProxyModel::create(m_model))
{ {
set_active_widget(nullptr); set_active_widget(nullptr);
set_content_margins({ 2, 2, 2, 2 }); set_content_margins({ 2, 2, 2, 2 });
m_icon_view = add<GUI::IconView>(); m_icon_view = add<GUI::IconView>();
m_icon_view->set_model(model()); m_icon_view->set_model(m_sorting_model);
m_columns_view = add<GUI::ColumnsView>(); m_columns_view = add<GUI::ColumnsView>();
m_columns_view->set_model(model()); m_columns_view->set_model(m_sorting_model);
m_table_view = add<GUI::TableView>(); m_table_view = add<GUI::TableView>();
m_table_view->set_model(GUI::SortingProxyModel::create(m_model)); m_table_view->set_model(m_sorting_model);
m_table_view->model()->set_key_column_and_sort_order(GUI::FileSystemModel::Column::Name, GUI::SortOrder::Ascending); m_table_view->model()->set_key_column_and_sort_order(GUI::FileSystemModel::Column::Name, GUI::SortOrder::Ascending);
@ -159,14 +160,14 @@ DirectoryView::DirectoryView()
on_thumbnail_progress(done, total); on_thumbnail_progress(done, total);
}; };
m_icon_view->on_activation = [&](const GUI::ModelIndex& index) { m_icon_view->on_activation = [&](auto& index) {
handle_activation(index); handle_activation(map_index(index));
}; };
m_columns_view->on_activation = [&](const GUI::ModelIndex& index) { m_columns_view->on_activation = [&](auto& index) {
handle_activation(index); handle_activation(map_index(index));
}; };
m_table_view->on_activation = [&](auto& index) { m_table_view->on_activation = [&](auto& index) {
handle_activation(map_table_view_index(index)); handle_activation(map_index(index));
}; };
m_table_view->on_selection_change = [this] { m_table_view->on_selection_change = [this] {
@ -187,28 +188,28 @@ DirectoryView::DirectoryView()
m_table_view->on_context_menu_request = [this](auto& index, auto& event) { m_table_view->on_context_menu_request = [this](auto& index, auto& event) {
if (on_context_menu_request) if (on_context_menu_request)
on_context_menu_request(*m_table_view, map_table_view_index(index), event); on_context_menu_request(*m_table_view, map_index(index), event);
}; };
m_icon_view->on_context_menu_request = [this](auto& index, auto& event) { m_icon_view->on_context_menu_request = [this](auto& index, auto& event) {
if (on_context_menu_request) if (on_context_menu_request)
on_context_menu_request(*m_icon_view, index, event); on_context_menu_request(*m_icon_view, map_index(index), event);
}; };
m_columns_view->on_context_menu_request = [this](auto& index, auto& event) { m_columns_view->on_context_menu_request = [this](auto& index, auto& event) {
if (on_context_menu_request) if (on_context_menu_request)
on_context_menu_request(*m_columns_view, index, event); on_context_menu_request(*m_columns_view, map_index(index), event);
}; };
m_table_view->on_drop = [this](auto& index, auto& event) { m_table_view->on_drop = [this](auto& index, auto& event) {
if (on_drop) if (on_drop)
on_drop(*m_table_view, map_table_view_index(index), event); on_drop(*m_table_view, map_index(index), event);
}; };
m_icon_view->on_drop = [this](auto& index, auto& event) { m_icon_view->on_drop = [this](auto& index, auto& event) {
if (on_drop) if (on_drop)
on_drop(*m_icon_view, index, event); on_drop(*m_icon_view, map_index(index), event);
}; };
m_columns_view->on_drop = [this](auto& index, auto& event) { m_columns_view->on_drop = [this](auto& index, auto& event) {
if (on_drop) if (on_drop)
on_drop(*m_columns_view, index, event); on_drop(*m_columns_view, map_index(index), event);
}; };
set_view_mode(ViewMode::Icon); set_view_mode(ViewMode::Icon);
@ -303,10 +304,9 @@ void DirectoryView::open_next_directory()
} }
} }
GUI::ModelIndex DirectoryView::map_table_view_index(const GUI::ModelIndex& index) const GUI::ModelIndex DirectoryView::map_index(const GUI::ModelIndex& index) const
{ {
auto& filter_model = (const GUI::SortingProxyModel&)*m_table_view->model(); return m_sorting_model->map_to_source(index);
return filter_model.map_to_source(index);
} }
void DirectoryView::update_statusbar() void DirectoryView::update_statusbar()
@ -340,13 +340,7 @@ void DirectoryView::update_statusbar()
builder.append(')'); builder.append(')');
if (selected_item_count == 1) { if (selected_item_count == 1) {
auto index = current_view().selection().first(); auto& node = model().node(map_index(current_view().selection().first()));
// FIXME: This is disgusting. This code should not even be aware that there is a GUI::SortingProxyModel in the table view.
if (m_view_mode == ViewMode::Table)
index = map_table_view_index(index);
auto& node = model().node(index);
if (!node.symlink_target.is_empty()) { if (!node.symlink_target.is_empty()) {
builder.append(" -> "); builder.append(" -> ");
builder.append(node.symlink_target); builder.append(node.symlink_target);

3
Applications/FileManager/DirectoryView.h
View file

@ -124,7 +124,7 @@ private:
virtual void model_did_update(unsigned) override; virtual void model_did_update(unsigned) override;
void handle_activation(const GUI::ModelIndex&); void handle_activation(const GUI::ModelIndex&);
GUI::ModelIndex map_table_view_index(const GUI::ModelIndex&) const; GUI::ModelIndex map_index(const GUI::ModelIndex&) const;
void set_status_message(const StringView&); void set_status_message(const StringView&);
void update_statusbar(); void update_statusbar();
@ -132,6 +132,7 @@ private:
ViewMode m_view_mode { Invalid }; ViewMode m_view_mode { Invalid };
NonnullRefPtr<GUI::FileSystemModel> m_model; NonnullRefPtr<GUI::FileSystemModel> m_model;
NonnullRefPtr<GUI::SortingProxyModel> m_sorting_model;
size_t m_path_history_position { 0 }; size_t m_path_history_position { 0 };
Vector<String> m_path_history; Vector<String> m_path_history;
void add_path_to_history(const StringView& path); void add_path_to_history(const StringView& path);