#6131: LightInspector panel activation/deactivation handling

codereader · Oct 22, 2022 · d71fc5b · d71fc5b
1 parent d783d05
commit d71fc5b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/radiant/ui/lightinspector/LightInspector.cpp b/radiant/ui/lightinspector/LightInspector.cpp
@@ -48,11 +48,22 @@ LightInspector::LightInspector(wxWindow* parent) :
     makeLabelBold(this, "LightInspectorOptionsLabel");
 
     SetMinSize(contents->GetEffectiveMinSize());
+}
 
-    _selectionChanged.disconnect();
-    _undoHandler.disconnect();
-    _redoHandler.disconnect();
+void LightInspector::onPanelActivated()
+{
+    connectListeners();
+    // Update the widgets right now
+    update();
+}
 
+void LightInspector::onPanelDeactivated()
+{
+    disconnectListeners();
+}
+
+void LightInspector::connectListeners()
+{
     // Register self as observer to receive events
     _undoHandler = GlobalMapModule().signal_postUndo().connect(
         sigc::mem_fun(this, &LightInspector::update));
@@ -62,9 +73,13 @@ LightInspector::LightInspector(wxWindow* parent) :
     // Register self to the SelSystem to get notified upon selection changes.
     _selectionChanged = GlobalSelectionSystem().signal_selectionChanged().connect(
         [this](const ISelectable&) { update(); });
+}
 
-    // Update the widgets right now
-    update();
+void LightInspector::disconnectListeners()
+{
+    _selectionChanged.disconnect();
+    _undoHandler.disconnect();
+    _redoHandler.disconnect();
 }
 
 void LightInspector::shaderSelectionChanged()

diff --git a/radiant/ui/lightinspector/LightInspector.h b/radiant/ui/lightinspector/LightInspector.h
@@ -60,7 +60,14 @@ class LightInspector :
     LightInspector(wxWindow* parent);
     ~LightInspector() override;
 
+protected:
+    void onPanelActivated() override;
+    void onPanelDeactivated() override;
+
 private:
+    void connectListeners();
+    void disconnectListeners();
+
     // Widget construction functions
     void setupLightShapeOptions();
     void bindSpawnargToCheckbox(std::string spawnarg, std::string checkbox);