From 6caaa2bfdb0bf26050c132293b03647c46a070c6 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 12 Aug 2020 20:27:23 +0200 Subject: [PATCH] FileManager: Remove one direct call to FileSystemModel from outside We should stop accessing the FileSystemModel outside DirectoryView. This whole app is pretty badly factored, due to LibGUI being in its infancy while it first developed. --- Applications/FileManager/DirectoryView.cpp | 5 +++++ Applications/FileManager/DirectoryView.h | 2 ++ Applications/FileManager/main.cpp | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Applications/FileManager/DirectoryView.cpp b/Applications/FileManager/DirectoryView.cpp index 0b3d83ec68..76e468a862 100644 --- a/Applications/FileManager/DirectoryView.cpp +++ b/Applications/FileManager/DirectoryView.cpp @@ -355,3 +355,8 @@ void DirectoryView::update_statusbar() set_status_message(builder.to_string()); } + +void DirectoryView::set_should_show_dotfiles(bool show_dotfiles) +{ + m_model->set_should_show_dotfiles(show_dotfiles); +} diff --git a/Applications/FileManager/DirectoryView.h b/Applications/FileManager/DirectoryView.h index 9ff361eca2..389f5630bc 100644 --- a/Applications/FileManager/DirectoryView.h +++ b/Applications/FileManager/DirectoryView.h @@ -110,6 +110,8 @@ public: callback(*m_columns_view); } + void set_should_show_dotfiles(bool); + GUI::FileSystemModel& model() { return *m_model; } private: diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index 0138c6be9a..ea2be2f849 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -678,7 +678,7 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio view_menu.add_action(*view_as_columns_action); view_menu.add_separator(); view_menu.add_action(GUI::Action::create_checkable("Show dotfiles", { Mod_Ctrl, Key_H }, [&](auto& action) { - directory_view.model().set_should_show_dotfiles(action.is_checked()); + directory_view.set_should_show_dotfiles(action.is_checked()); })); auto& go_menu = menubar->add_menu("Go");