Merge pull request #6163 from johnhaddon/dragDropFixes

Small drag & drop fixes

Changes.md

@@ -1,7 +1,11 @@
 1.4.15.x (relative to 1.4.15.2)
 ========
 
+Fixes
+-----
 
+- GraphEditor : Fixed errors when dragging an unknown file type into the GraphEditor.
+- Widget : Fixed `event.sourceWidget` for DragDropEvents generated from a Qt native drag within the same Gaffer process. This will now reference the `GafferUI.Widget` that the Qt source widget belongs to, if any.
 
 1.4.15.2 (relative to 1.4.15.1)
 ========

python/GafferUI/Widget.py

@@ -1578,9 +1578,13 @@ def __foreignDragEnter( self, qObject, qEvent ) :
 			Widget._modifiers( qEvent.keyboardModifiers() ),
 		)
 		dragDropEvent.data = data
-		dragDropEvent.sourceWidget = None
 		dragDropEvent.destinationWidget = None
 
+		if isinstance( qEvent.source(), QtWidgets.QWidget ) :
+			dragDropEvent.sourceWidget = GafferUI.Widget._owner( qEvent.source() )
+		else :
+			dragDropEvent.sourceWidget = None
+
 		if widget._dragEnterSignal( widget, dragDropEvent ) :
 			qEvent.acceptProposedAction()
 			self.__foreignDragDropEvent = dragDropEvent

startup/gui/graphEditor.py

@@ -245,7 +245,8 @@ def __dropLocationData( event ) :
 	if (
 		not isinstance( event.data, IECore.StringVectorData ) or
 		len( event.data ) != 1 or
-		not event.data[0].startswith( "/" )
+		not event.data[0].startswith( "/" ) or
+		event.sourceWidget is None
 	) :
 		return None