Create group by key press.

Author: kovacsv

Sources/NodeEngineTest/NodeEditorVisualTest.cpp

@@ -164,6 +164,23 @@ TEST (SelectionTest)
 	}
 }
 
+TEST (CreateGroupTest)
+{
+	SimpleNodeEditorTestEnv env (GetDefaultSkinParams ());
+
+	{ // select two nodes with selection rect
+		Point rectSelectStart = env.rangeInputRect.GetTopLeft () - Point (10.0, 10.0);
+		Point rectSelectEnd (env.viewer2InputRect.GetRight () + 10.0, env.rangeInputRect.GetBottom () + 10.0);
+		env.DragDrop (rectSelectStart, rectSelectEnd);
+		ASSERT (env.CheckReference ("CreateGroup_NodesSelected.svg"));
+	}
+
+	{ // create group
+		env.KeyPress (Key (KeyCode::Group));
+		ASSERT (env.CheckReference ("CreateGroup_GroupCreated.svg"));
+	}
+}
+
 TEST (MoveNodesTest)
 {
 	SimpleNodeEditorTestEnv env (GetDefaultSkinParams ());

Sources/NodeEngineTest/VisualTestFiles/CreateGroup_GroupCreated.svg

@@ -380,6 +380,11 @@ void NodeEditorTestEnv::DragDrop (const ModifierKeys& keys, const Point& from, c
 	nodeEditor.OnMouseUp (keys, MouseButton::Left, (int) to.GetX (), (int) to.GetY ());
 }
 
+void NodeEditorTestEnv::KeyPress (const NUIE::Key& key)
+{
+	nodeEditor.OnKeyPress (key);
+}
+
 void NodeEditorTestEnv::SetNextCommandName (const std::wstring& nextCommandName)
 {
 	uiEnvironment.SetNextCommandName (nextCommandName);

Sources/NodeEngineTest/VisualTestFiles/CreateGroup_NodesSelected.svg

@@ -82,6 +82,7 @@ class NodeEditorTestEnv
 	void	Wheel (MouseWheelRotation rotation, const Point& point);
 	void	DragDrop (const Point& from, const Point& to, const std::function<void ()>& beforeMouseUp = nullptr);
 	void	DragDrop (const ModifierKeys& keys, const Point& from, const Point& to, const std::function<void ()>& beforeMouseUp = nullptr); 
+	void	KeyPress (const NUIE::Key& key);
 	void	SetNextCommandName (const std::wstring& nextCommandName);
 	void	SetNextCommandParameterSettings (const ParameterSettingsHandler& handler);
 

Sources/NodeEngineTest/VisualTestFramework.cpp

@@ -37,6 +37,7 @@ enum class KeyCode
 	SelectAll,
 	Copy,
 	Paste,
+	Group,
 	Undo,
 	Redo
 };

Sources/NodeEngineTest/VisualTestFramework.hpp

@@ -865,6 +865,11 @@ EventHandlerResult InteractionHandler::HandleKeyPress (NodeUIEnvironment& env, c
 				command.reset (new PasteNodesMenuCommand (uiManager, modelPastePosition));
 			}
 			break;
+		case KeyCode::Group:
+			{
+				command.reset (new CreateGroupMenuCommand (uiManager, selectedNodes));
+			}
+			break;
 		case KeyCode::Undo:
 			{
 				command.reset (new UndoMenuCommand (uiManager, env));

Sources/NodeUIEngine/NUIE_InputEventHandler.hpp

@@ -173,6 +173,9 @@ static LRESULT CALLBACK NodeEditorStaticWindowProc (HWND hwnd, UINT msg, WPARAM
 						case 'V':
 							pressedKey.SetKeyCode (NUIE::KeyCode::Paste);
 							break;
+						case 'G':
+							pressedKey.SetKeyCode (NUIE::KeyCode::Group);
+							break;
 						case 'Z':
 							pressedKey.SetKeyCode (NUIE::KeyCode::Undo);
 							break;