Merge pull request #474 from jonassorgenfrei/fix-paint-hickups-diable-and-backdrop-node

Fix paint hickups for disable and backdrop node

Author: jchanvfx

NodeGraphQt/qgraphics/node_backdrop.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from Qt import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import Z_VAL_BACKDROP, NodeEnum
 from NodeGraphQt.qgraphics.node_abstract import AbstractNodeItem
@@ -79,10 +79,12 @@ def paint(self, painter, option, widget):
 
         margin = 1.0
         rect = self.boundingRect()
-        rect = QtCore.QRectF(rect.left() + margin,
-                             rect.top() + margin,
-                             rect.width() - (margin * 2),
-                             rect.height() - (margin * 2))
+        rect = QtCore.QRectF(
+            rect.left() + margin,
+            rect.top() + margin,
+            rect.width() - (margin * 2),
+            rect.height() - (margin * 2),
+        )
 
         item = self.parentItem()
         if item and item.selected:
@@ -159,6 +161,7 @@ def mouseReleaseEvent(self, event):
     def on_sizer_pos_changed(self, pos):
         self._width = pos.x() + self._sizer.size
         self._height = pos.y() + self._sizer.size
+        self.update()
 
     def on_sizer_pos_mouse_release(self):
         size = {
@@ -189,10 +192,12 @@ def paint(self, painter, option, widget):
 
         margin = 1.0
         rect = self.boundingRect()
-        rect = QtCore.QRectF(rect.left() + margin,
-                             rect.top() + margin,
-                             rect.width() - (margin * 2),
-                             rect.height() - (margin * 2))
+        rect = QtCore.QRectF(
+            rect.left() + margin,
+            rect.top() + margin,
+            rect.width() - (margin * 2),
+            rect.height() - (margin * 2),
+        )
 
         radius = 2.6
         color = (self.color[0], self.color[1], self.color[2], 50)

NodeGraphQt/qgraphics/node_overlay_disabled.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from Qt import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import Z_VAL_NODE_WIDGET
 
@@ -22,7 +22,17 @@ def __init__(self, parent=None, text=None):
         self.text = text
 
     def boundingRect(self):
-        return self.parentItem().boundingRect()
+        rect = self.parentItem().boundingRect()
+
+        # marging (base margin = 20, point size = 4, pen width bleed = 4)
+        margin = 28
+
+        return QtCore.QRectF(
+            rect.left() - margin / 2,
+            rect.top() - margin / 2,
+            rect.width() + margin,
+            rect.height() + margin,
+        )
 
     def paint(self, painter, option, widget):
         """
@@ -37,11 +47,14 @@ def paint(self, painter, option, widget):
         painter.save()
 
         margin = 20
-        rect = self.boundingRect()
-        dis_rect = QtCore.QRectF(rect.left() - (margin / 2),
-                                 rect.top() - (margin / 2),
-                                 rect.width() + margin,
-                                 rect.height() + margin)
+        rect = self.parentItem().boundingRect()
+        dis_rect = QtCore.QRectF(
+            rect.left() - (margin / 2),
+            rect.top() - (margin / 2),
+            rect.width() + margin,
+            rect.height() + margin,
+        )
+
         if not self.proxy_mode:
             pen = QtGui.QPen(QtGui.QColor(*self.color), 8)
             pen.setCapStyle(QtCore.Qt.RoundCap)
@@ -52,10 +65,12 @@ def paint(self, painter, option, widget):
         bg_color = QtGui.QColor(*self.color)
         bg_color.setAlpha(100)
         bg_margin = -0.5
-        bg_rect = QtCore.QRectF(dis_rect.left() - (bg_margin / 2),
-                                dis_rect.top() - (bg_margin / 2),
-                                dis_rect.width() + bg_margin,
-                                dis_rect.height() + bg_margin)
+        bg_rect = QtCore.QRectF(
+            dis_rect.left() - (bg_margin / 2),
+            dis_rect.top() - (bg_margin / 2),
+            dis_rect.width() + bg_margin,
+            dis_rect.height() + bg_margin,
+        )
         painter.setPen(QtGui.QPen(QtGui.QColor(0, 0, 0, 0)))
         painter.setBrush(bg_color)
         painter.drawRoundedRect(bg_rect, 5, 5)
@@ -71,14 +86,17 @@ def paint(self, painter, option, widget):
         painter.drawLine(dis_rect.topLeft(), dis_rect.bottomRight())
         painter.drawLine(dis_rect.topRight(), dis_rect.bottomLeft())
 
-        point_pos = (dis_rect.topLeft(), dis_rect.topRight(),
-                     dis_rect.bottomLeft(), dis_rect.bottomRight())
+        point_pos = (
+            dis_rect.topLeft(),
+            dis_rect.topRight(),
+            dis_rect.bottomLeft(),
+            dis_rect.bottomRight(),
+        )
         painter.setBrush(QtGui.QColor(255, 0, 0, 255))
         for p in point_pos:
             p.setX(p.x() - (point_size / 2))
             p.setY(p.y() - (point_size / 2))
-            point_rect = QtCore.QRectF(
-                p, QtCore.QSizeF(point_size, point_size))
+            point_rect = QtCore.QRectF(p, QtCore.QSizeF(point_size, point_size))
             painter.drawEllipse(point_rect)
 
         if self.text and not self.proxy_mode:
@@ -91,16 +109,22 @@ def paint(self, painter, option, widget):
             font_height = font_metrics.height()
             txt_w = font_width * 1.25
             txt_h = font_height * 2.25
-            text_bg_rect = QtCore.QRectF((rect.width() / 2) - (txt_w / 2),
-                                         (rect.height() / 2) - (txt_h / 2),
-                                         txt_w, txt_h)
+            text_bg_rect = QtCore.QRectF(
+                (rect.width() / 2) - (txt_w / 2),
+                (rect.height() / 2) - (txt_h / 2),
+                txt_w,
+                txt_h,
+            )
             painter.setPen(QtGui.QPen(QtGui.QColor(255, 0, 0), 0.5))
             painter.setBrush(QtGui.QColor(*self.color))
             painter.drawRoundedRect(text_bg_rect, 2, 2)
 
-            text_rect = QtCore.QRectF((rect.width() / 2) - (font_width / 2),
-                                      (rect.height() / 2) - (font_height / 2),
-                                      txt_w * 2, font_height * 2)
+            text_rect = QtCore.QRectF(
+                (rect.width() / 2) - (font_width / 2),
+                (rect.height() / 2) - (font_height / 2),
+                txt_w * 2,
+                font_height * 2,
+            )
 
             painter.setPen(QtGui.QPen(QtGui.QColor(255, 0, 0), 1))
             painter.drawText(text_rect, self.text)