From 5ca888132dff6433006b1d6466d93011c91e959a Mon Sep 17 00:00:00 2001 From: Lennon Donaghy Date: Mon, 2 Aug 2021 19:26:20 +0100 Subject: [PATCH] HackStudio: Make FindInFilesWidget reset when opening new project Add method to FindInFilesWidget which resets the model in order to clear the output when needed, and use this when a new project is opened. --- Userland/DevTools/HackStudio/FindInFilesWidget.cpp | 4 ++++ Userland/DevTools/HackStudio/FindInFilesWidget.h | 2 ++ Userland/DevTools/HackStudio/HackStudioWidget.cpp | 1 + 3 files changed, 7 insertions(+) diff --git a/Userland/DevTools/HackStudio/FindInFilesWidget.cpp b/Userland/DevTools/HackStudio/FindInFilesWidget.cpp index 88fa1ad899..f38474ed55 100644 --- a/Userland/DevTools/HackStudio/FindInFilesWidget.cpp +++ b/Userland/DevTools/HackStudio/FindInFilesWidget.cpp @@ -148,5 +148,9 @@ void FindInFilesWidget::focus_textbox_and_select_all() m_textbox->select_all(); m_textbox->set_focus(true); } +void FindInFilesWidget::reset() +{ + m_result_view->set_model(nullptr); +} } diff --git a/Userland/DevTools/HackStudio/FindInFilesWidget.h b/Userland/DevTools/HackStudio/FindInFilesWidget.h index 3b1c337090..38fd360efe 100644 --- a/Userland/DevTools/HackStudio/FindInFilesWidget.h +++ b/Userland/DevTools/HackStudio/FindInFilesWidget.h @@ -20,6 +20,8 @@ public: void focus_textbox_and_select_all(); + void reset(); + private: explicit FindInFilesWidget(); diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.cpp b/Userland/DevTools/HackStudio/HackStudioWidget.cpp index 5ac37b27ec..cbd47fba3d 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.cpp +++ b/Userland/DevTools/HackStudio/HackStudioWidget.cpp @@ -199,6 +199,7 @@ void HackStudioWidget::open_project(const String& root_path) m_open_files.clear(); m_open_files_vector.clear(); add_new_editor(*m_editors_splitter); + m_find_in_files_widget->reset(); m_todo_entries_widget->clear(); m_terminal_wrapper->clear_including_history(); stop_debugger_if_running();