#6131: MapMergePanel activation/deactivation handling

codereader · Oct 22, 2022 · c69a805 · c69a805
1 parent 2abcdad
commit c69a805
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/radiant/ui/merge/MapMergePanel.cpp b/radiant/ui/merge/MapMergePanel.cpp
@@ -112,9 +112,26 @@ MapMergePanel::MapMergePanel(wxWindow* parent) :
 
     Layout();
     Fit();
+}
+
+MapMergePanel::~MapMergePanel()
+{
+    disconnectListeners();
+}
 
-    //SetMinSize(wxSize(400, 290));
+void MapMergePanel::onPanelActivated()
+{
+    connectListeners();
+    update();
+}
 
+void MapMergePanel::onPanelDeactivated()
+{
+    disconnectListeners();
+}
+
+void MapMergePanel::connectListeners()
+{
     // Register self to the SelSystem to get notified upon selection changes.
     GlobalSelectionSystem().addObserver(this);
 
@@ -129,14 +146,10 @@ MapMergePanel::MapMergePanel(wxWindow* parent) :
         sigc::mem_fun(this, &MapMergePanel::queueUpdate));
     _redoHandler = GlobalMapModule().signal_postRedo().connect(
         sigc::mem_fun(this, &MapMergePanel::queueUpdate));
-
-    // Check for selection changes before showing the dialog again
-    update();
 }
 
-MapMergePanel::~MapMergePanel()
+void MapMergePanel::disconnectListeners()
 {
-    // A hidden window doesn't need to listen for events
     _undoHandler.disconnect();
     _redoHandler.disconnect();
     _mapEventHandler.disconnect();

diff --git a/radiant/ui/merge/MapMergePanel.h b/radiant/ui/merge/MapMergePanel.h
@@ -47,8 +47,13 @@ class MapMergePanel final :
 
 protected:
     void onIdle() override;
+    void onPanelActivated() override;
+    void onPanelDeactivated() override;
 
 private:
+    void connectListeners();
+    void disconnectListeners();
+
     void convertTextCtrlToPathEntry(const std::string& ctrlName);
     void onMergeSourceChanged(wxCommandEvent& ev);
     void onMergeModeChanged(wxCommandEvent& ev);