qpuiq 0.20__tar.gz → 0.22__tar.gz

{qpuiq-0.20 → qpuiq-0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qpuiq
-Version: 0.20
+Version: 0.22
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu

{qpuiq-0.20 → qpuiq-0.22}/PUI/PySide6/canvas.py

@@ -6,7 +6,7 @@ from PySide6.QtGui import QPainter, QColor, QPainterPath, QImage
 
 class PUIQtCanvas(QtWidgets.QWidget):
     def __init__(self, node, width=None, height=None):
-        self.node = node
+        self.puinode = node
         self.width = width
         self.height = height
         super().__init__()
@@ -18,25 +18,25 @@ class PUIQtCanvas(QtWidgets.QWidget):
         e = PUIEvent()
         e.button = event.button().value
         e.x, e.y = event.position().toPoint().toTuple()
-        self.node._dblclicked(e)
+        self.puinode._dblclicked(e)
 
     def mousePressEvent(self, event):
         e = PUIEvent()
         e.button = event.button().value
         e.x, e.y = event.position().toPoint().toTuple()
-        self.node._mousedown(e)
+        self.puinode._mousedown(e)
 
     def mouseReleaseEvent(self, event):
         e = PUIEvent()
         e.button = event.button().value
         e.x, e.y = event.position().toPoint().toTuple()
-        self.node._mouseup(e)
+        self.puinode._mouseup(e)
 
     def mouseMoveEvent(self, event):
         e = PUIEvent()
         e.button = event.button().value
         e.x, e.y = event.position().toPoint().toTuple()
-        self.node._mousemove(e)
+        self.puinode._mousemove(e)
 
     def wheelEvent(self, event):
         e = PUIEvent()
@@ -56,26 +56,26 @@ class PUIQtCanvas(QtWidgets.QWidget):
         if emodifiers & QtCore.Qt.MetaModifier:
             modifier |= KeyModifier.META
         e.modifiers = modifier
-        self.node._wheel(e)
+        self.puinode._wheel(e)
 
     def paintEvent(self, event):
-        node = self.node.get_node()
-        node.qpainter = QPainter()
-        node.qpainter.begin(self)
-        node.qpainter.setRenderHints(QtGui.QPainter.Antialiasing, True)
+        puinode = self.puinode.get_node()
+        puinode.qpainter = QPainter()
+        puinode.qpainter.begin(self)
+        puinode.qpainter.setRenderHints(QtGui.QPainter.Antialiasing, True)
 
-        if not node.style_bgcolor is None:
+        if not puinode.style_bgcolor is None:
             bgBrush = QtGui.QBrush()
-            bgBrush.setColor(QtGui.QColor(node.style_bgcolor))
+            bgBrush.setColor(QtGui.QColor(puinode.style_bgcolor))
             bgBrush.setStyle(QtCore.Qt.SolidPattern)
             rect = QtCore.QRect(0, 0, self.width or self.geometry().width(), self.height or self.geometry().height())
-            node.qpainter.fillRect(rect, bgBrush)
+            puinode.qpainter.fillRect(rect, bgBrush)
 
-        node.width = self.geometry().width()
-        node.height = self.geometry().height()
-        immediate = node.painter(node, *node.args)
-        node.qpainter.end()
-        node.qpainter = None
+        puinode.width = self.geometry().width()
+        puinode.height = self.geometry().height()
+        immediate = puinode.painter(puinode, *puinode.args)
+        puinode.qpainter.end()
+        puinode.qpainter = None
         if immediate:
             self.update()
 
@@ -114,7 +114,6 @@ class Canvas(QtBaseWidget):
             self.ui.height = self.layout_height or 0
         else:
             self.ui = PUIQtCanvas(self, self.layout_width or 0, self.layout_height or 0)
-        self.ui.node = self
         self.ui.setMouseTracking(bool(self._onMouseMove))
         self.ui.update()
         super().update(prev)

{qpuiq-0.20 → qpuiq-0.22}/PUI/PySide6/scroll.py

@@ -75,7 +75,6 @@ class Scroll(QtBaseWidget):
         if node.destroyed:
             return
         node.children[0].outer.origResizeEvent(event)
-        node.children[0].outer.resizeEvent = self.onUiResized
         if node.horizontal is False:
             if isinstance(node.children[0], QtBaseLayout):
                 node.outer.setMinimumWidth(node.children[0].outer.sizeHint().width())
@@ -88,6 +87,9 @@ class Scroll(QtBaseWidget):
             elif isinstance(node.children[0], QtBaseWidget):
                 node.outer.setMinimumHeight(node.children[0].outer.sizeHint().height())
 
+    def postSync(self):
+        self.children[0].outer.resizeEvent = self.onUiResized
+
     def scrollX(self, pos=0):
         if math.copysign(1, pos) >= 0:
             self.align_x = 0

{qpuiq-0.20 → qpuiq-0.22}/PUI/PySide6/window.py

@@ -9,7 +9,7 @@ class QMainWindow(QtWidgets.QMainWindow):
     def keyPressEvent(self, event):
         e = PUIEvent()
         e.text = event.text()
-        self.node._keypress(e)
+        self.puinode._keypress(e)
 
     def mousePressEvent(self, event):
         focused_widget = QtWidgets.QApplication.focusWidget()
@@ -34,13 +34,13 @@ class Window(QtBaseWidget):
     def update(self, prev=None):
         if prev and prev.ui:
             self.ui = prev.ui
-            self.ui.node = self
+            self.ui.puinode = self
             self.curr_size = prev.curr_size
             self.curr_maximize = prev.curr_maximize
             self.curr_fullscreen = prev.curr_fullscreen
         else:
             self.ui = QMainWindow()
-            self.ui.node = self
+            self.ui.puinode = self
             self.ui.show()
             self.curr_size = Prop()
             self.curr_maximize = Prop()

{qpuiq-0.20 → qpuiq-0.22}/PUI/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.20"
+__version__ = "0.22"
 
 from .node import *
 from .view import *

{qpuiq-0.20 → qpuiq-0.22}/PUI/dom.py

@@ -237,7 +237,8 @@ def sync(node, dom_parent, dom_offset, oldVDOM, newVDOM, depth=0):
         print(f"{(depth+1)*'    '}S4. TRIM", f"dom_offset={dom_offset}", len(oldVDOM), "=>", len(newVDOM))
     while len(oldVDOM) > nl:
         old = oldVDOM.pop(nl)
-        print(f"{(depth+2)*'    '}", f"key={old.key} virtual={old.pui_virtual} children={len(old.children)}")
+        if DEBUG:
+            print(f"{(depth+2)*'    '}", f"key={old.key} virtual={old.pui_virtual} children={len(old.children)}")
         oldVMap.pop(nl)
         nodes = dom_remove_node(dom_parent, dom_offset + nl, old)
         dom_children_num -= len([n for n in nodes if not n.pui_virtual and not n.pui_outoforder])

{qpuiq-0.20 → qpuiq-0.22}/PUI/state.py

@@ -199,6 +199,9 @@ class StateObject(BaseState):
         if ex_type is None: # don't consume exception
             return self
 
+    def __eq__(self, other):
+        return self.__values == other
+
     # getter
     def __getattr__(self, key):
         if not key.startswith("_"):
@@ -278,6 +281,9 @@ class StateList(BaseState):
         if ex_type is None: # don't consume exception
             return self
 
+    def __eq__(self, other):
+        return self.__values == other
+
     # getter
     def __getitem__(self, key):
         try:
@@ -295,6 +301,7 @@ class StateList(BaseState):
             elif isinstance(ret, StateDict):
                 ret._StateDict__listeners.add(view)
         return ret
+
     # setter
     def __setitem__(self, key, value):
         try:
@@ -520,6 +527,9 @@ class StateDict(BaseState):
         if ex_type is None: # don't consume exception
             return self
 
+    def __eq__(self, other):
+        return self.__values == other
+
     # setter
     def __delitem__(self, key):
         try:

{qpuiq-0.20 → qpuiq-0.22}/QPUIQ.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qpuiq
-Version: 0.20
+Version: 0.22
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu