#5537: Each DeclarationSelector monitors its corresponding decl::Type…

… to refresh the tree on reloadDecls.
codereader · Sep 18, 2022 · e488861 · e488861
1 parent 43f426f
commit e488861
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 38 deletions.
diff --git a/libs/wxutil/EntityClassChooser.cpp b/libs/wxutil/EntityClassChooser.cpp
@@ -224,6 +224,8 @@ class EntityClassSelector :
 
         AddPreviewToRightPane(_preview.get());
         AddPreviewToBottom(new EntityClassDescription(this));
+
+        Populate();
     }
 
     void Populate() override
@@ -234,7 +236,6 @@ class EntityClassSelector :
 
 EntityClassChooser::EntityClassChooser(Purpose purpose) :
     DeclarationSelectorDialog(decl::Type::EntityDef, getDialogTitle(purpose), "EntityClassChooser"),
-    _selector(nullptr),
     _restoreSelectionFromRegistry(true)
 {
     auto affirmativeButton = GetAffirmativeButton();
@@ -254,25 +255,12 @@ EntityClassChooser::EntityClassChooser(Purpose purpose) :
         throw std::logic_error("Unknown entity class chooser purpose");
     }
 
-    // Listen for defs-reloaded signal (cannot bind directly to
-    // ThreadedEntityClassLoader method because it is not sigc::trackable)
-    _defsReloaded = GlobalDeclarationManager().signal_DeclsReloaded(decl::Type::EntityDef).connect(
-        [this]() { GlobalUserInterface().dispatch([this]() { loadEntityClasses(); }); }
-    );
-
-    SetSelector(setupSelector(this));
-
-    loadEntityClasses();
+    SetSelector(new EntityClassSelector(this));
 
     // Save the state of the selector widget on dialog close
     RegisterPersistableObject(this);
 }
 
-EntityClassChooser::~EntityClassChooser()
-{
-    _defsReloaded.disconnect();
-}
-
 std::string EntityClassChooser::ChooseEntityClass(Purpose purpose, const std::string& eclassToSelect)
 {
     EntityClassChooser instance{ purpose };
@@ -291,11 +279,6 @@ std::string EntityClassChooser::ChooseEntityClass(Purpose purpose, const std::st
     return ""; // Empty selection on cancel
 }
 
-void EntityClassChooser::loadEntityClasses()
-{
-    _selector->Populate();
-}
-
 void EntityClassChooser::SetSelectedDeclName(const std::string& declName)
 {
     DeclarationSelectorDialog::SetSelectedDeclName(declName);
@@ -320,10 +303,4 @@ void EntityClassChooser::saveToPath(const std::string& registryKey)
     GlobalRegistry().setAttribute(registryKey, "lastSelectedDeclName", GetSelectedDeclName());
 }
 
-EntityClassSelector* EntityClassChooser::setupSelector(wxWindow* parent)
-{
-    _selector = new EntityClassSelector(parent);
-    return _selector;
-}
-
 } // namespace ui
diff --git a/libs/wxutil/EntityClassChooser.h b/libs/wxutil/EntityClassChooser.h
@@ -3,14 +3,11 @@
 #include "decl/DeclarationSelectorDialog.h"
 #include "ui/iwindowstate.h"
 
-#include <sigc++/connection.h>
 #include <wx/dataview.h>
 
 namespace wxutil
 {
 
-class EntityClassSelector;
-
 /**
  * Dialog window displaying a tree of Entity Classes, allowing the selection
  * of a class to create at the current location.
@@ -30,19 +27,10 @@ class EntityClassChooser final :
     };
 
 private:
-    EntityClassSelector* _selector;
-
-    sigc::connection _defsReloaded;
-
     bool _restoreSelectionFromRegistry;
 
 private:
     EntityClassChooser(Purpose purpose);
-    ~EntityClassChooser() override;
-
-    void loadEntityClasses();
-
-    EntityClassSelector* setupSelector(wxWindow * parent);
 
 public:
     void loadFromPath(const std::string& registryKey) override;

diff --git a/libs/wxutil/decl/DeclarationSelector.cpp b/libs/wxutil/decl/DeclarationSelector.cpp
@@ -4,6 +4,7 @@
 #include <wx/splitter.h>
 #include "../dataview/ResourceTreeViewToolbar.h"
 #include "DeclFileInfo.h"
+#include "ui/iuserinterface.h"
 
 namespace wxutil
 {
@@ -41,6 +42,16 @@ DeclarationSelector::DeclarationSelector(wxWindow* parent, decl::Type declType,
 
     _leftPanel->GetSizer()->Add(_treeVbox, 1, wxEXPAND);
     // the right panel has room for a preview widget => AddPreviewToRightPane
+
+    // Listen for decls-reloaded signal to refresh the tree
+    _declsReloaded = GlobalDeclarationManager().signal_DeclsReloaded(_declType).connect(
+        [this]() { GlobalUserInterface().dispatch([this]() { Populate(); }); }
+    );
+}
+
+DeclarationSelector::~DeclarationSelector()
+{
+    _declsReloaded.disconnect();
 }
 
 void DeclarationSelector::AddPreviewToRightPane(ui::IDeclarationPreview* preview, int sizerProportion)

diff --git a/libs/wxutil/decl/DeclarationSelector.h b/libs/wxutil/decl/DeclarationSelector.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <vector>
+#include <sigc++/connection.h>
+
 #include "idecltypes.h"
 #include "ui/iwindowstate.h"
 #include <wx/panel.h>
@@ -42,13 +44,17 @@ class DeclarationSelector :
 
     std::unique_ptr<PanedPosition> _panedPosition;
 
+    sigc::connection _declsReloaded;
+
 public:
     // Construct a selector widget with the default set of tree view columns
     DeclarationSelector(wxWindow* parent, decl::Type declType);
 
     // Construct a selector widget with the given set of tree view columns
     DeclarationSelector(wxWindow* parent, decl::Type declType, const DeclarationTreeView::Columns& columns);
 
+    ~DeclarationSelector() override;
+
     /**
      * Return the declaration selected by the user, or an empty string if there
      * was no selection.