#5127: Subscribe to favourite changes to update the list

codereader · Jan 6, 2021 · 69e799d · 69e799d
1 parent f27e9f0
commit 69e799d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/radiant/ui/favourites/FavouritesBrowser.cpp b/radiant/ui/favourites/FavouritesBrowser.cpp
@@ -43,6 +43,18 @@ void FavouritesBrowser::construct()
     _iconList.reset(new wxImageList(16, 16));
     _listView->SetImageList(_iconList.get(), wxIMAGE_LIST_SMALL);
 
+    setupCategories();
+
+    auto* toolHBox = new wxBoxSizer(wxHORIZONTAL);
+    toolHBox->Add(createLeftToolBar(), 1, wxEXPAND);
+    toolHBox->Add(createRightToolBar(), 0, wxEXPAND);
+
+    _mainWidget->GetSizer()->Add(toolHBox, 0, wxEXPAND);
+    _mainWidget->GetSizer()->Add(_listView, 1, wxEXPAND);
+}
+
+void FavouritesBrowser::setupCategories()
+{
     auto prefix = GlobalUIManager().ArtIdPrefix();
 
     _categories.emplace_back(FavouriteCategory{
@@ -66,13 +78,13 @@ void FavouritesBrowser::construct()
         nullptr
     });
 
-
-    auto* toolHBox = new wxBoxSizer(wxHORIZONTAL);
-    toolHBox->Add(createLeftToolBar(), 1, wxEXPAND);
-    toolHBox->Add(createRightToolBar(), 0, wxEXPAND);
-
-    _mainWidget->GetSizer()->Add(toolHBox, 0, wxEXPAND);
-    _mainWidget->GetSizer()->Add(_listView, 1, wxEXPAND);
+    // Subscribe to any favourite changes
+    for (auto& category : _categories)
+    {
+        changedConnections.emplace_back(GlobalFavouritesManager().getSignalForType(category.type).connect(
+            sigc::mem_fun(this, &FavouritesBrowser::onFavouritesChanged)
+        ));
+    }
 }
 
 wxToolBar* FavouritesBrowser::createRightToolBar()
@@ -182,6 +194,11 @@ void FavouritesBrowser::initialiseModule(const IApplicationContext& ctx)
 void FavouritesBrowser::shutdownModule()
 {
     _iconList.reset();
+
+    for (auto& connection : changedConnections)
+    {
+        connection.disconnect();
+    }
 }
 
 void FavouritesBrowser::togglePage(const cmd::ArgumentList& args)
@@ -220,6 +237,10 @@ void FavouritesBrowser::onShowFullPathToggled(wxCommandEvent& ev)
     reloadFavourites();
 }
 
+void FavouritesBrowser::onFavouritesChanged()
+{
+    reloadFavourites(); // TODO: lazy
+}
 
 module::StaticModule<FavouritesBrowser> favouritesBrowserModule;
 

diff --git a/radiant/ui/favourites/FavouritesBrowser.h b/radiant/ui/favourites/FavouritesBrowser.h
@@ -6,6 +6,7 @@
 #include <wx/listctrl.h>
 #include <wx/imaglist.h>
 #include <wx/toolbar.h>
+#include <sigc++/connection.h>
 
 namespace ui
 {
@@ -31,6 +32,7 @@ class FavouritesBrowser :
 
     // Maps decl type to icon index
     std::list<FavouriteCategory> _categories;
+    std::list<sigc::connection> changedConnections;
 
     wxCheckBox* _showFullPath;
 
@@ -47,7 +49,9 @@ class FavouritesBrowser :
     wxToolBar* createLeftToolBar();
     wxToolBar* createRightToolBar();
     void onMainFrameConstructed();
+    void onFavouritesChanged();
     void reloadFavourites();
+    void setupCategories();
 
     void togglePage(const cmd::ArgumentList& args);
     void onCategoryToggled(wxCommandEvent& ev);