#5746: TexTool is listening to manipulator mode changes now

radiant/textool/TexTool.cpp

@@ -134,6 +134,7 @@ void TexTool::_preHide()
 	_redoHandler.disconnect();
 
 	_selectionChanged.disconnect();
+    _manipulatorChanged.disconnect();
 
 	// Clear items to prevent us from running into stale references
 	// when the textool is shown again
@@ -148,6 +149,7 @@ void TexTool::_preShow()
 	_selectionChanged.disconnect();
 	_undoHandler.disconnect();
 	_redoHandler.disconnect();
+    _manipulatorChanged.disconnect();
 
 	// Register self to the SelSystem to get notified upon selection changes.
 	_selectionChanged = GlobalSelectionSystem().signal_selectionChanged().connect(
@@ -158,6 +160,10 @@ void TexTool::_preShow()
 	_redoHandler = GlobalUndoSystem().signal_postRedo().connect(
 		sigc::mem_fun(this, &TexTool::onUndoRedoOperation));
 
+    _manipulatorChanged = GlobalTextureToolSelectionSystem().signal_activeManipulatorChanged().connect(
+        sigc::mem_fun(this, &TexTool::onManipulatorModeChanged)
+    );
+
 	// Trigger an update of the current selection
     _selectionRescanNeeded = true;
     queueDraw();
@@ -168,6 +174,11 @@ void TexTool::onUndoRedoOperation()
     queueDraw();
 }
 
+void TexTool::onManipulatorModeChanged(selection::IManipulator::Type type)
+{
+    queueDraw();
+}
+
 void TexTool::gridUp() {
 	if (_grid*2 <= GRID_MAX && _gridActive) {
 		_grid *= 2;

radiant/textool/TexTool.h

@@ -89,6 +89,7 @@ class TexTool :
 	sigc::connection _selectionChanged;
 	sigc::connection _undoHandler;
 	sigc::connection _redoHandler;
+	sigc::connection _manipulatorChanged;
 
 private:
 	// This is where the static shared_ptr of the singleton instance is held.
@@ -287,6 +288,7 @@ class TexTool :
 private:
     void updateProjection();
     double getTextureAspectRatio();
+    void onManipulatorModeChanged(selection::IManipulator::Type type);
 
     TextureToolMouseEvent createMouseEvent(const Vector2& point, const Vector2& delta = Vector2(0, 0));