Issue #72: Node [Panel] Redesign: continued...

Author: kateliev

Lib/typerig/proxy/fl/gui/styles.py

@@ -8,7 +8,7 @@
 # No warranties. By using this you agree
 # that you use it at your own risk!
 
-__version__ = '0.0.2'
+__version__ = '0.0.3'
 
 # -- CSS Styling ------------------------
 css_fl_button = '''
@@ -101,22 +101,30 @@
 QDoubleSpinBox#spn_panel {
     max-height: 20px;
     max-width: 60px;
+    min-height: 20px;
+    min-width: 60px;
 }
 
 QPushButton#btn_panel_opt,
 QPushButton#btn_panel, 
 QLabel#lbl_panel {
+    /*margin: 2 0 2 0;*/
+    /*padding: 2 0 2 0;*/
+    background: none;
+    border-radius: 5px;
+    border: 1px solid transparent;
     color: #212121;
     font-family: "TypeRig Icons";
     font-size: 20px;
-    background: none;
-    border-radius: 5px;
-    /*margin: 2 0 2 0;*/
-    /*padding: 2 0 2 0;*/
     max-height: 26px;
     max-width: 26px;
     min-height: 26px;
     min-width: 26px;
+    text-align: center;
+}
+
+QLabel#lbl_panel {
+    border: none;
 }
 
 QPushButton#btn_panel_opt{

Lib/typerig/proxy/fl/gui/widgets.py

@@ -26,7 +26,7 @@
 from typerig.proxy.fl.objects.glyph import eGlyph
 
 # - Init ----------------------------------
-__version__ = '0.3.7'
+__version__ = '0.3.9'
 
 # - Keep compatibility for basestring checks
 try:
@@ -193,6 +193,7 @@ def __init__(self, button_text, init_values=(0., 100., 0., 1.), tooltip=(None, N
 		self.box.addWidget(self.input)
 		self.box.addWidget(self.button)
 		self.setLayout(self.box)
+		self.setSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
 
 # -- Sub Dialogs --------------------------
 class TRLayerSelectDLG(QtGui.QDialog):
@@ -923,7 +924,6 @@ def __init__(self, *args, **kwargs):
 			''')
 
 # - Layouts ----------------------------------------
-'''
 class TRFlowLayout(QtGui.QLayout):
 	# As adapted from https://stackoverflow.com/questions/60398756/pyqt-oriented-flow-layout
 
@@ -935,7 +935,6 @@ def __init__(self, orientation=QtCore.Qt.Horizontal, parent=None, margin=0, spac
 			self.setContentsMargins(margin, margin, margin, margin)
 
 		self.setSpacing(spacing)
-
 		self.itemList = []
 
 	def __del__(self):
@@ -968,16 +967,16 @@ def hasHeightForWidth(self):
 		return self.orientation == QtCore.Qt.Horizontal
 
 	def heightForWidth(self, width):
-		return self.doLayout(QRect(0, 0, width, 0), True)
+		return self.doLayout(QtCore.QRect(0, 0, width, 0), True)
 
 	def hasWidthForHeight(self):
 		return self.orientation == QtCore.Qt.Vertical
 
 	def widthForHeight(self, height):
-		return self.doLayout(QRect(0, 0, 0, height), True)
+		return self.doLayout(QtCore.QRect(0, 0, 0, height), True)
 
 	def setGeometry(self, rect):
-		super().setGeometry(rect)
+		#super().setGeometry(rect)
 		self.doLayout(rect, False)
 
 	def sizeHint(self):
@@ -989,9 +988,8 @@ def minimumSize(self):
 		for item in self.itemList:
 			size = size.expandedTo(item.minimumSize())
 
-		margin, _, _, _ = self.getContentsMargins()
+		size += QtCore.QSize(2 * self.margin, 2 * self.margin)
 
-		size += QtCore.QSize(2 * margin, 2 * margin)
 		return size
 
 	def doLayout(self, rect, testOnly):
@@ -1000,11 +998,13 @@ def doLayout(self, rect, testOnly):
 		lineHeight = columnWidth = heightForWidth = 0
 
 		for item in self.itemList:
-			wid = item.widget()
-			spaceX = self.spacing() + wid.style().layoutSpacing(QtGui.QSizePolicy.PushButton, QtGui.QSizePolicy.PushButton, QtCore.Qt.Horizontal)
-			spaceY = self.spacing() + wid.style().layoutSpacing(QtGui.QSizePolicy.PushButton, QtGui.QSizePolicy.PushButton, QtCore.Qt.Vertical)
+			widget = item.widget()
+			spaceX = self.spacing + widget.style().layoutSpacing(QtGui.QSizePolicy.PushButton, QtGui.QSizePolicy.PushButton, QtCore.Qt.Horizontal)
+			spaceY = self.spacing + widget.style().layoutSpacing(QtGui.QSizePolicy.PushButton, QtGui.QSizePolicy.PushButton, QtCore.Qt.Vertical)
+			
 			if self.orientation == QtCore.Qt.Horizontal:
 				nextX = x + item.sizeHint().width() + spaceX
+				
 				if nextX - spaceX > rect.right() and lineHeight > 0:
 					x = rect.x()
 					y = y + lineHeight + spaceY
@@ -1016,8 +1016,10 @@ def doLayout(self, rect, testOnly):
 
 				x = nextX
 				lineHeight = max(lineHeight, item.sizeHint().height())
+			
 			else:
 				nextY = y + item.sizeHint().height() + spaceY
+				
 				if nextY - spaceY > rect.bottom() and columnWidth > 0:
 					x = x + columnWidth + spaceX
 					y = rect.y()
@@ -1033,6 +1035,6 @@ def doLayout(self, rect, testOnly):
 
 		if self.orientation == QtCore.Qt.Horizontal:
 			return y + lineHeight - rect.y()
+		
 		else:
 			return heightForWidth - rect.y()
-'''