Merge pull request #5689 from murraystevenson/dragEditGadget

GraphEditor Connection Cutting
GafferHQ · Mar 5, 2024 · 4932b73 · 4932b73
2 parents 2cef6f3 + 889c3ea
commit 4932b73
Show file tree

Hide file tree

Showing 10 changed files with 603 additions and 3 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,6 +1,11 @@
 1.4.x.x (relative to 1.4.0.0b1)
 =======
 
+Features
+--------
+
+- GraphEditor : Added <kbd>X</kbd> shortcut for removing connections between nodules. Hold <kbd>X</kbd> then left click to remove all connections under the cursor. Hold <kbd>X</kbd> then left drag to draw a line, all connections that intersect with the line will be removed once the drag is ended (#788).
+
 Improvements
 ------------
 

diff --git a/doc/source/Interface/ControlsAndShortcuts/index.md b/doc/source/Interface/ControlsAndShortcuts/index.md
@@ -152,6 +152,8 @@ Disconnect plug                      | {{leftClick}} and drag connection to back
 Insert node onto connection          | {{leftClick}} and drag node onto connection
 Auto-arrange selected nodes          | {kbd}`Ctrl` + {kbd}`L`
 Duplicate outgoing connection        | {kbd}`Shift` + {{leftClick}} and drag connection just before in plug
+Disconnect connections under cursor  | {kbd}`X` + {{leftClick}}
+Disconnect connections under line    | {kbd}`X` + {{leftClick}} and drag to draw a line, then release {{leftClick}}
 
 ### Focus Node ###
 

diff --git a/include/GafferUI/TypeIds.h b/include/GafferUI/TypeIds.h
@@ -85,6 +85,7 @@ enum TypeId
 	ToolContainerTypeId = 110291,
 	FPSGadgetTypeId = 110292,
 	ViewDisplayTransformTypeId = 110293,
+	DragEditGadgetTypeId = 110294,
 
 	LastTypeId = 110450
 };

diff --git a/resources/graphics.py b/resources/graphics.py
@@ -34,6 +34,8 @@
 				"pointerRemove",
 				"pointerRotate",
 				"pointerPivot",
+				"pointerCut",
+				"pointerNotEditable",
 			]
 		},
 

diff --git a/resources/graphics.svg b/resources/graphics.svg