remove owning node from comment node on resize

Mionsz · Nov 10, 2019 · 2e5940e · 2e5940e
1 parent c55554f
commit 2e5940e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/PyFlow/Packages/PyFlowBase/UI/UICommentNode.py b/PyFlow/Packages/PyFlowBase/UI/UICommentNode.py
@@ -135,6 +135,11 @@ def mouseReleaseEvent(self, event):
         super(UICommentNode, self).mouseReleaseEvent(event)
         if not self.collapsed:
             collidingNodes = self.getCollidedNodes()
+
+            for owningNode in set(self.owningNodes):
+                if owningNode not in collidingNodes:
+                    self.owningNodes.remove(owningNode)
+
             for node in collidingNodes:
                 node.updateOwningCommentNode()
 

diff --git a/PyFlow/UI/Canvas/UINodeBase.py b/PyFlow/UI/Canvas/UINodeBase.py
@@ -1070,7 +1070,7 @@ def getCollidedNodes(self, bFullyCollided=True, classNameFilters=set()):
                         if node.__class__.__name__ not in classNameFilters:
                             continue
                     if node._rawNode.graph() != self.canvasRef().graphManager.activeGraph():
-                            continue
+                        continue
                     collidingNodes.add(node)
         return collidingNodes
 

diff --git a/PyFlow/UI/Widgets/BlueprintCanvas.py b/PyFlow/UI/Widgets/BlueprintCanvas.py
@@ -803,6 +803,7 @@ def validateCommentNodesOwnership(self, graph, bExpandComments=True):
         self.state = CanvasState.COMMENT_OWNERSHIP_VALIDATION
         comments = {}
         defaultNodes = set()
+
         # expand all comment nodes and reset owning nodes info
         for node in graph.getNodesList():
             uiNode = node.getWrapper()
@@ -837,7 +838,6 @@ def mousePressEvent(self, event):
         modifiers = event.modifiers()
         self.mousePressPose = event.pos()
         expandComments = False
-        # self.validateCommentNodesOwnership(self.graphManager.activeGraph(), expandComments)
         currentInputAction = InputAction("temp", "temp", InputActionType.Mouse, event.button(), modifiers=modifiers)
         if any([not self.pressed_item,
                 isinstance(self.pressed_item, UIConnection) and modifiers != QtCore.Qt.AltModifier,
@@ -1311,7 +1311,6 @@ def mouseReleaseEvent(self, event):
             self.requestClearProperties.emit()
         self.resizing = False
         self.updateReroutes(event, False)
-        # self.validateCommentNodesOwnership(self.graphManager.activeGraph(), False)
 
     def removeItemByName(self, name):
         [self.scene().removeItem(i) for i in self.scene().items() if hasattr(i, 'name') and i.name == name]