Enable panning during node move interactions.

Author: kovacsv

Sources/NodeEngineTest/NodeEditorVisualTest.cpp

@@ -600,4 +600,38 @@ TEST (NodeOrderTest)
 	}
 }
 
+TEST (MultiMouseMoveHandlerTest)
+{
+	NodeEditorTestEnv env (GetDefaultSkinParams ());
+	Point padding (10.0, 10.0);
+
+	{ // create two nodes
+		env.nodeEditor.AddNode (UINodePtr (new DoubleUpDownNode (LocString (L"Number 1"), Point (100.0, 100.0), 0.0, 1.0)));
+		env.nodeEditor.AddNode (UINodePtr (new DoubleUpDownNode (LocString (L"Number 2"), Point (250.0, 250.0), 0.0, 1.0)));
+		ASSERT (env.CheckReference (L"MultiMouseMoveHandlerTest_Initial.svg"));
+	}
+
+	Point mousePosition;
+	{ // start dragging number 2
+		mousePosition = env.GetNodeRect (env.GetNode (L"Number 2")).GetTopLeft () + padding;
+		env.nodeEditor.OnMouseDown (EmptyModifierKeys, MouseButton::Left, (int) mousePosition.GetX (), (int) mousePosition.GetY ());
+		mousePosition = mousePosition + Point (100, 0);
+		env.nodeEditor.OnMouseMove (EmptyModifierKeys, (int) mousePosition.GetX (), (int) mousePosition.GetY ());
+		ASSERT (env.CheckReference (L"MultiMouseMoveHandlerTest_Number2Dragging.svg"));
+	}
+
+	{ // start panning the canvas
+		env.nodeEditor.OnMouseDown (EmptyModifierKeys, MouseButton::Right, (int) mousePosition.GetX (), (int) mousePosition.GetY ());
+		mousePosition = mousePosition + Point (0, 50);
+		env.nodeEditor.OnMouseMove (EmptyModifierKeys, (int) mousePosition.GetX (), (int) mousePosition.GetY ());
+		ASSERT (env.CheckReference (L"MultiMouseMoveHandlerTest_Number2DraggingAndPanning.svg"));
+	}
+
+	{ // release mouse buttons
+		env.nodeEditor.OnMouseUp (EmptyModifierKeys, MouseButton::Right, (int) mousePosition.GetX (), (int) mousePosition.GetY ());
+		env.nodeEditor.OnMouseUp (EmptyModifierKeys, MouseButton::Left, (int) mousePosition.GetX (), (int) mousePosition.GetY ());
+		ASSERT (env.CheckReference (L"MultiMouseMoveHandlerTest_Final.svg"));
+	}
+}
+
 }

Sources/NodeEngineTest/VisualTestFiles/MultiMouseMoveHandlerTest_Final.svg

@@ -120,11 +120,6 @@ class NodeMovingHandler : public MouseMoveHandler
 
 	}
 
-	virtual bool AreOtherHandlersAllowed () const override
-	{
-		return false;
-	}
-
 	virtual void HandleMouseDown (NodeUIEnvironment&, const ModifierKeys&, const Point& position) override
 	{
 		const ViewBox& viewBox = uiManager.GetViewBox ();
@@ -195,11 +190,6 @@ class NodeCopyMovingHandler : public MouseMoveHandler
 		});
 	}
 
-	virtual bool AreOtherHandlersAllowed () const override
-	{
-		return false;
-	}
-
 	virtual void HandleMouseDown (NodeUIEnvironment&, const ModifierKeys&, const Point& position) override
 	{
 		const ViewBox& viewBox = uiManager.GetViewBox ();
@@ -591,10 +581,10 @@ EventHandlerResult InteractionHandler::HandleMouseDragStart (NodeUIEnvironment&
 		multiMouseMoveHandler.AddHandler (mouseButton, new PanningHandler (uiManager));
 	}
 
-	multiMouseMoveHandler.EnumerateHandlers ([&] (const std::shared_ptr<MouseMoveHandler>& handler) {
-		handler->OnMouseDown (uiEnvironment, modifierKeys, position);
+	if (multiMouseMoveHandler.HasHandler (mouseButton)) {
+		multiMouseMoveHandler.GetHandler (mouseButton)->OnMouseDown (uiEnvironment, modifierKeys, position);
 		handlerResult = EventHandlerResult::EventHandled;
-	});
+	}
 
 	return handlerResult;
 }