#6131: TexTool panel activation/deactivation handling

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

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/radiant/textool/TexTool.cpp b/radiant/textool/TexTool.cpp
@@ -61,7 +61,6 @@ TexTool::TexTool(wxWindow* parent) :
     _determineThemeFromImage(false)
 {
 	populateWindow();
-    connectListeners();
 
     registry::observeBooleanKey(
         textool::RKEY_GRID_STATE,
@@ -74,6 +73,27 @@ TexTool::TexTool(wxWindow* parent) :
         std::bind(&TexTool::onMouseUp, this, std::placeholders::_1));
 }
 
+TexTool::~TexTool()
+{
+    disconnectListeners();
+}
+
+void TexTool::onPanelActivated()
+{
+    connectListeners();
+
+    // Trigger an update of the current selection
+    _selectionRescanNeeded = true;
+    updateThemeButtons();
+    updateManipulationPanel();
+    requestIdleCallback();
+}
+
+void TexTool::onPanelDeactivated()
+{
+    disconnectListeners();
+}
+
 void TexTool::setGridActive(bool active)
 {
 	_gridActive = active;
@@ -152,11 +172,6 @@ wxWindow* TexTool::createManipulationPanel()
     return panel;
 }
 
-TexTool::~TexTool()
-{
-    disconnectListeners();
-}
-
 void TexTool::disconnectListeners()
 {
     _shader.reset();
@@ -243,12 +258,6 @@ void TexTool::connectListeners()
     );
 
     _gridChanged = GlobalGrid().signal_gridChanged().connect(sigc::mem_fun(this, &TexTool::queueDraw));
-
-	// Trigger an update of the current selection
-    _selectionRescanNeeded = true;
-    updateThemeButtons();
-    updateManipulationPanel();
-    requestIdleCallback();
 }
 
 bool TexTool::textureToolHasFocus()

diff --git a/radiant/textool/TexTool.h b/radiant/textool/TexTool.h
@@ -185,6 +185,9 @@ class TexTool :
 	// Idle callback, used for deferred updates
 	void onIdle() override;
 
+    void onPanelActivated() override;
+    void onPanelDeactivated() override;
+
     MouseTool::Result processMouseDownEvent(const MouseToolPtr& tool, const Vector2& point) override;
     MouseTool::Result processMouseUpEvent(const MouseToolPtr& tool, const Vector2& point) override;
     MouseTool::Result processMouseMoveEvent(const MouseToolPtr& tool, int x, int y) override;