upgrade color picker widget

Author: ArnoChenFx

NodeGraphQt/widgets/properties.py

@@ -30,77 +30,52 @@ def get_value(self):
         raise NotImplementedError
 
 
-class _ColorSolid(QtWidgets.QWidget):
-
-    def __init__(self, parent=None, color=None):
-        super(_ColorSolid, self).__init__(parent)
-        self.setFixedSize(15, 15)
-        self.color = color or (0, 0, 0)
-
-    def paintEvent(self, event):
-        size = self.geometry()
-        rect = QtCore.QRect(1, 1, size.width() - 2, size.height() - 2)
-        painter = QtGui.QPainter(self)
-        painter.setPen(QtCore.Qt.NoPen)
-        painter.setBrush(QtGui.QColor(*self._color))
-        painter.drawRoundedRect(rect, 1, 1)
-
-    @property
-    def color(self):
-        return self._color
-
-    @color.setter
-    def color(self, color):
-        self._color = color
-        hex = '#{0:02x}{1:02x}{2:02x}'.format(*self._color)
-        self.setToolTip('rgb: {}\nhex: {}'.format(self._color[0:3], hex))
-        self.update()
-
-
 class PropColorPicker(BaseProperty):
-
     def __init__(self, parent=None):
         super(PropColorPicker, self).__init__(parent)
         self._color = (0, 0, 0)
-        self._label = QtWidgets.QLabel()
         self._button = QtWidgets.QPushButton()
+        self._vector = PropVector3()
+        self._vector.set_value([0, 0, 0])
         self._update_color()
 
         self._button.clicked.connect(self._on_select_color)
+        self._vector.value_changed.connect(self._on_vector_changed)
         layout = QtWidgets.QHBoxLayout(self)
-        layout.setContentsMargins(0, 0, 8, 0)
+        layout.setContentsMargins(0, 0, 0, 0)
         layout.setSpacing(4)
-        layout.addWidget(self._label, 0, QtCore.Qt.AlignCenter)
-        layout.addWidget(self._button, 1, QtCore.Qt.AlignLeft)
+        layout.addWidget(self._button, 0, QtCore.Qt.AlignLeft)
+        layout.addWidget(self._vector, 1, QtCore.Qt.AlignLeft)
+
+    def _on_vector_changed(self, o, value):
+        self._color = tuple(value)
+        self._update_color()
+        self.value_changed.emit(self.toolTip(), value)
+
+    def _update_vector(self):
+        self._vector.set_value(list(self._color))
 
     def _on_select_color(self):
-        color = QtWidgets.QColorDialog.getColor(QtGui.QColor(*self.get_value()),
-                                                options=QtWidgets.QColorDialog.ShowAlphaChannel)
+        color = QtWidgets.QColorDialog.getColor(QtGui.QColor.fromRgbF(*self.get_value()))
         if color.isValid():
             self.set_value(color.getRgb())
 
     def _update_color(self):
-        hex = self.hex_color()
-        self._label.setText(hex)
-        self._label.setAlignment(QtCore.Qt.AlignCenter)
-        self._label.setMinimumWidth(60)
-
+        c = [int(max(min(i, 255), 0)) for i in self._color]
+        hex_color = '#{0:02x}{1:02x}{2:02x}'.format(*c)
         self._button.setStyleSheet(
             '''QPushButton {{background-color: rgba({0}, {1}, {2}, 255);}}
-               QPushButton::hover {{background-color: rgba({0}, {1}, {2}, 200);}}'''
-                .format(*self._color))
-        self._button.setToolTip('rgb: {}\nhex: {}'.format(self._color[0:3], hex))
-
-    def hex_color(self):
-        return '#{0:02x}{1:02x}{2:02x}'.format(*self._color)
+               QPushButton::hover {{background-color: rgba({0}, {1}, {2}, 200);}}'''.format(*c))
+        self._button.setToolTip('rgb: {}\nhex: {}'.format(self._color[:3], hex_color))
 
     def get_value(self):
-        return self._color
+        return self._color[:3]
 
     def set_value(self, value):
         if value != self.get_value():
             self._color = value
             self._update_color()
+            self._update_vector()
             self.value_changed.emit(self.toolTip(), value)
 
 
@@ -619,7 +594,7 @@ def _on_value_change(self, value=None, index=None):
 
     def _update_items(self):
         for index, value in enumerate(self._value):
-            if self._items[index].value() != value:
+            if index < len(self._items) and self._items[index].value() != value:
                 self._items[index].setValue(value)
 
     def get_value(self):

NodeGraphQt/widgets/properties_bin.py

@@ -44,8 +44,10 @@ def __init__(self, parent=None):
         self.setShowGrid(False)
         self.verticalHeader().hide()
         self.horizontalHeader().hide()
-        self.horizontalHeader().setResizeMode(QtWidgets.QHeaderView.Stretch)
-        self.verticalHeader().setResizeMode(QtWidgets.QHeaderView.Stretch)
+        QtCompat.QHeaderView.setSectionResizeMode(
+            self.verticalHeader(), QtWidgets.QHeaderView.Stretch)
+        QtCompat.QHeaderView.setSectionResizeMode(
+            self.horizontalHeader(), 0, QtWidgets.QHeaderView.Stretch)
         self.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
 
     def wheelEvent(self, event):