qpuiq 0.12__py3-none-any.whl → 0.14__py3-none-any.whl

PUI/PySide6/base.py

@@ -193,20 +193,20 @@ class QtBaseLayout(PUINode):
         from .modal import Modal
         from .layout import Spacer
         if isinstance(child, Spacer):
-            self.layout.insertItem(idx, child.outer)
+            self.qtlayout.insertItem(idx, child.outer)
         elif isinstance(child, Modal):
             pass
         elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):
             params = {}
             if not child.layout_weight is None:
                 params["stretch"] = child.layout_weight
-            self.layout.insertWidget(idx, child.outer, **params)
+            self.qtlayout.insertWidget(idx, child.outer, **params)
 
     def removeChild(self, idx, child):
         from .modal import Modal
         from .layout import Spacer
         if isinstance(child, Spacer):
-            self.layout.removeItem(child.outer)
+            self.qtlayout.removeItem(child.outer)
         elif isinstance(child, Modal):
             pass
         elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):

PUI/PySide6/canvas.py

@@ -2,8 +2,7 @@ from .. import *
 from .base import *
 
 from PySide6 import QtWidgets, QtGui
-from PySide6.QtGui import QPainter, QColor, QPainterPath
-from PySide6.QtCore import QPoint
+from PySide6.QtGui import QPainter, QColor, QPainterPath, QImage
 
 class PUIQtCanvas(QtWidgets.QWidget):
     def __init__(self, node, width=None, height=None):
@@ -46,6 +45,17 @@ class PUIQtCanvas(QtWidgets.QWidget):
         e.x_delta = event.pixelDelta().x()
         e.v_delta = event.angleDelta().y()
         e.h_delta = event.angleDelta().x()
+        modifier = 0
+        emodifiers = event.modifiers()
+        if emodifiers & QtCore.Qt.ShiftModifier:
+            modifier |= KeyModifier.SHIFT
+        if emodifiers & QtCore.Qt.ControlModifier:
+            modifier |= KeyModifier.CTRL
+        if emodifiers & QtCore.Qt.AltModifier:
+            modifier |= KeyModifier.ALT
+        if emodifiers & QtCore.Qt.MetaModifier:
+            modifier |= KeyModifier.META
+        e.modifiers = modifier
         self.node._wheel(e)
 
     def paintEvent(self, event):
@@ -61,6 +71,8 @@ class PUIQtCanvas(QtWidgets.QWidget):
             rect = QtCore.QRect(0, 0, self.width or self.geometry().width(), self.height or self.geometry().height())
             node.qpainter.fillRect(rect, bgBrush)
 
+        node.width = self.geometry().width()
+        node.height = self.geometry().height()
         node.painter(node, *node.args)
 
         node.qpainter.end()
@@ -286,3 +298,27 @@ class Canvas(QtBaseWidget):
             self.drawPolyline(shape.coords, color=stroke, width=width)
         else:
             raise RuntimeError(f"Not implemented: drawShapely({type(shape).__name__}) {dir(shape)}")
+
+    def loadImage(self, image_path):
+        return QImage(image_path)
+
+    def drawImage(self, image, x=0, y=0, width=None, height=None, src_x=0, src_y=0, src_width=None, src_height=None, opacity=1.0):
+        if image.isNull():
+            return
+
+        if src_width is None:
+            src_width = image.width() - src_x
+        if src_height is None:
+            src_height = image.height() - src_y
+
+        source_rect = QtCore.QRect(src_x, src_y, src_width, src_height)
+
+        if width is None:
+            width = src_width
+        if height is None:
+            height = src_height
+
+        dest_rect = QtCore.QRect(x, y, width, height)
+        self.qpainter.setOpacity(opacity)
+        self.qpainter.drawImage(dest_rect, image, source_rect)
+        self.qpainter.setOpacity(1.0)

PUI/PySide6/combobox.py

@@ -24,13 +24,16 @@ class ComboBox(QtBaseWidget):
         super().update(prev)
 
     def postSync(self):
+        index = 0
+        text = ""
+
         if self.index_model:
             index = self.index_model.value
             text = self.children[index].text
         elif self.text_model:
             text = str(self.text_model.value)
             try:
-                index = [c.text for c in self.children].index(text)
+                index = [c.value for c in self.children].index(text)
             except:
                 index = 0
 
@@ -51,11 +54,15 @@ class ComboBox(QtBaseWidget):
     def on_currentIndexChanged(self, idx):
         if self.index_model:
             self.index_model.value = idx
+        if self.text_model:
+            self.text_model.value = self.children[idx].value
         e = PUIEvent()
         e.value = idx
         self._change(e)
 
     def on_currentTextChanged(self, text):
+        if not self.editable:
+            return
         if self.text_model:
             self.text_model.value = text
         e = PUIEvent()
@@ -69,7 +76,10 @@ class ComboBox(QtBaseWidget):
         self.ui.removeItem(idx)
 
 class ComboBoxItem(PUINode):
-    def __init__(self, text):
+    def __init__(self, text, value=None):
         super().__init__()
         self.id(text)
         self.text = text
+        if value is None:
+            value = text
+        self.value = value

PUI/PySide6/image.py

@@ -1,5 +1,8 @@
 from .. import *
 from .base import *
+from .label import ClickableQLabel
+from PySide6.QtWidgets import QSizePolicy
+import os
 
 class Image(QtBaseWidget):
     def __init__(self, path):
@@ -10,13 +13,28 @@ class Image(QtBaseWidget):
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
+            self.eventFilter = prev.eventFilter
             self.curr_path = prev.curr_path
+            self.curr_path_mtime = prev.curr_path_mtime
             self.pixmap = prev.pixmap
         else:
-            self.ui = QtWidgets.QLabel()
+            self.ui = ClickableQLabel()
+            self.ui.clicked.connect(self._clicked)
             self.curr_path = Prop()
+            self.curr_path_mtime = Prop()
 
-        if self.curr_path.set(self.path):
+        if self._onClicked:
+            self.ui.setCursor(QtCore.Qt.PointingHandCursor)
+
+        if self.layout_weight:
+            # XXX keep aspect ratio
+            self.ui.setScaledContents(True)
+            self.ui.setSizePolicy(QSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored))
+        else:
+            self.ui.setScaledContents(False)
+            self.ui.setSizePolicy(QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred))
+
+        if self.curr_path.set(self.path) or self.curr_path_mtime.set(os.path.getmtime(self.path)):
             self.pixmap = QtGui.QPixmap(self.path)
             if self.layout_width is not None and self.layout_height is not None:
                 self.pixmap = self.pixmap.scaled(self.layout_width, self.layout_height, QtCore.Qt.KeepAspectRatio, mode=QtCore.Qt.SmoothTransformation)

PUI/PySide6/layout.py

@@ -5,24 +5,24 @@ class HBox(QtBaseLayout):
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
-            self.layout = prev.layout
+            self.qtlayout = prev.qtlayout
         else:
             self.ui = QtWidgets.QWidget()
-            self.layout = QtWidgets.QHBoxLayout()
-            self.layout.setContentsMargins(0,0,0,0)
-            self.ui.setLayout(self.layout)
+            self.qtlayout = QtWidgets.QHBoxLayout()
+            self.qtlayout.setContentsMargins(0,0,0,0)
+            self.ui.setLayout(self.qtlayout)
         super().update(prev)
 
 class VBox(QtBaseLayout):
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
-            self.layout = prev.layout
+            self.qtlayout = prev.qtlayout
         else:
             self.ui = QtWidgets.QWidget()
-            self.layout = QtWidgets.QVBoxLayout()
-            self.layout.setContentsMargins(0,0,0,0)
-            self.ui.setLayout(self.layout)
+            self.qtlayout = QtWidgets.QVBoxLayout()
+            self.qtlayout.setContentsMargins(0,0,0,0)
+            self.ui.setLayout(self.qtlayout)
         super().update(prev)
 
 class Spacer(PUINode):

PUI/PySide6/tree.py

@@ -2,6 +2,9 @@ from .. import *
 from .base import *
 from PySide6.QtCore import Qt, QModelIndex, QAbstractItemModel
 
+# XXX
+# If click handler triggers a model reset, dblclick handler will not be called
+
 class QAbstractItemModelAdapter(QtCore.QAbstractItemModel):
     def __init__(self, model: "BaseTreeAdapter"):
         super().__init__()
@@ -21,7 +24,7 @@ class QAbstractItemModelAdapter(QtCore.QAbstractItemModel):
 
         defaultFlags = super().flags(index)
 
-        return defaultFlags | QtCore.Qt.ItemIsDragEnabled | QtCore.Qt.ItemIsDropEnabled | QtCore.Qt.ItemIsEditable
+        return defaultFlags | QtCore.Qt.ItemIsDragEnabled | QtCore.Qt.ItemIsDropEnabled
 
     def canDropMimeData(self, data, action, row, column, parent):
         if parent.isValid():
@@ -77,13 +80,12 @@ class QAbstractItemModelAdapter(QtCore.QAbstractItemModel):
         self.model.collapsed(node)
 
 class QTreeNodeModelAdapter(QtCore.QAbstractItemModel):
-    def __init__(self, rootnode):
+    def __init__(self):
         super().__init__()
         self.node = None
-        self.rootnode = rootnode
 
     def index(self, row, column, parent = QtCore.QModelIndex()):
-        parent_node = parent.internalPointer() if parent.isValid() else self.rootnode
+        parent_node = parent.internalPointer() if parent.isValid() else self.node
         if 0 <= row and row < len(parent_node.children):
             child = parent_node.children[row]
             return self.createIndex(row, column, child)
@@ -95,7 +97,7 @@ class QTreeNodeModelAdapter(QtCore.QAbstractItemModel):
 
         defaultFlags = super().flags(index)
 
-        return defaultFlags | QtCore.Qt.ItemIsDragEnabled | QtCore.Qt.ItemIsDropEnabled | QtCore.Qt.ItemIsEditable
+        return defaultFlags | QtCore.Qt.ItemIsDragEnabled | QtCore.Qt.ItemIsDropEnabled
 
     def canDropMimeData(self, data, action, row, column, parent):
         if parent.isValid():
@@ -115,6 +117,8 @@ class QTreeNodeModelAdapter(QtCore.QAbstractItemModel):
             return QModelIndex()
         node = index.internalPointer()
         parent_node = node.parent
+        if not isinstance(parent_node, TreeNode):
+            parent_node = None
         if parent_node:
             return self.createIndex(0, 0, parent_node)
         return QModelIndex()
@@ -128,14 +132,14 @@ class QTreeNodeModelAdapter(QtCore.QAbstractItemModel):
         return None
 
     def rowCount(self, parent):
-        parent_node = parent.internalPointer() if parent.isValid() else self.rootnode
+        parent_node = parent.internalPointer() if parent.isValid() else self.node
         return len(parent_node.children)
 
     def columnCount(self, parent):
         return 1
 
     def hasChildren(self, parent):
-        parent_node = parent.internalPointer() if parent.isValid() else self.rootnode
+        parent_node = parent.internalPointer() if parent.isValid() else self.node
         return len(parent_node.children) > 0
 
     def clicked(self, node):
@@ -157,21 +161,29 @@ class Tree(QtBaseWidget):
         self.model = model
         self.curr_model = None
         self.pendings = []
+        self._expand_callback = None
+        self._collapse_callback = None
 
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
             self.qt_model = prev.qt_model
             self.curr_model = prev.curr_model
+
+            self.ui.clicked.disconnect()
+            self.ui.doubleClicked.disconnect()
+            self.ui.expanded.disconnect()
+            self.ui.collapsed.disconnect()
         else:
             self.qt_model = None
             self.curr_model = Prop()
             self.ui = QtWidgets.QTreeView()
             self.ui.setHeaderHidden(True)
-            self.ui.clicked.connect(self.on_item_clicked)
-            self.ui.doubleClicked.connect(self.on_item_double_clicked)
-            self.ui.expanded.connect(self.on_item_expanded)
-            self.ui.collapsed.connect(self.on_item_collapsed)
+
+        self.ui.clicked.connect(self.on_item_clicked)
+        self.ui.doubleClicked.connect(self.on_item_double_clicked)
+        self.ui.expanded.connect(self.on_item_expanded)
+        self.ui.collapsed.connect(self.on_item_collapsed)
 
         if self.model:
             if self.curr_model.set(self.model):
@@ -181,9 +193,14 @@ class Tree(QtBaseWidget):
             else:
                 self.qt_model.modelReset.emit()
         else:
-            self.qt_model = QTreeNodeModelAdapter(self)
-            self.qt_model.node = self
-            self.ui.setModel(self.qt_model)
+            if not self.qt_model:
+                self.qt_model = QTreeNodeModelAdapter()
+                self.qt_model.node = self
+                self.ui.setModel(self.qt_model)
+            else:
+                self.qt_model.beginResetModel()
+                self.qt_model.node = self
+                self.qt_model.endResetModel()
 
         for pending in self.pendings:
             pending[0](*pending[1:])
@@ -231,24 +248,20 @@ class Tree(QtBaseWidget):
             cb(*args, **kwargs)
 
     def on_item_clicked(self, index):
-        node = self.get_node()
         treenode = index.internalPointer()
-        self.qt_model.clicked(treenode)
+        self.get_node().qt_model.clicked(treenode)
 
     def on_item_double_clicked(self, index):
-        node = self.get_node()
         treenode = index.internalPointer()
-        self.qt_model.dblclicked(treenode)
+        self.get_node().qt_model.dblclicked(treenode)
 
     def on_item_expanded(self, index):
-        node = self.get_node()
         treenode = index.internalPointer()
-        self.qt_model.expanded(treenode)
+        self.get_node().qt_model.expanded(treenode)
 
     def on_item_collapsed(self, index):
-        node = self.get_node()
         treenode = index.internalPointer()
-        self.qt_model.collapsed(treenode)
+        self.get_node().qt_model.collapsed(treenode)
 
 class TreeNode(PUINode):
     def __init__(self, data=""):

PUI/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.12"
+__version__ = "0.14"
 
 from .node import *
 from .view import *

PUI/common.py

@@ -18,3 +18,9 @@ class MouseButton(IntEnum):
     MIDDLE = 4
     X1 = 8
     X2 = 16
+
+class KeyModifier(IntEnum):
+    SHIFT = 1
+    CTRL = 2
+    ALT = 4
+    META = 8

PUI/textual/__init__.py

@@ -30,5 +30,6 @@ class DummyWidget(TBase):
 Canvas = DummyWidget
 Combobox = DummyWidget
 ComboboxItem = DummyWidget
+Divider = lambda: None
 
 PUI_BACKEND = "textual"

PUI/textual/base.py

@@ -3,24 +3,57 @@ from textual import widgets, containers
 
 class TBase(PUINode):
     scroll = False
-    container_x = False
-    container_y = False
-    strong_expand_x = False
-    strong_expand_y = False
-    weak_expand_x = False
-    weak_expand_y = False
-    nweak_expand_x = False
-    nweak_expand_y = False
-    strong_expand_x_children = 0
-    strong_expand_y_children = 0
+    container_x = False # axis
+    container_y = False # axis
+    expand_x_prio = 0
+    expand_y_prio = 0
+    expand_x1_children = 0
+    expand_x2_children = 0
+    expand_x3_children = 0
+    expand_x4_children = 0
+    expand_y1_children = 0
+    expand_y2_children = 0
+    expand_y3_children = 0
+    expand_y4_children = 0
+    cached_tparent = None
 
     @property
     def expand_x(self):
-        return self.strong_expand_x or (self.weak_expand_x and not self.nweak_expand_x)
+        parent = self.cached_tparent
+        expand = self.expand_x_prio
+        if not parent:
+            return False
+
+        # textual handles 1fr as shrinkable, but we need scrolller's content not to shrink
+        # See Exp.1 in refs/textual_layout.py
+        if parent.scroll:
+            return False
+
+        # textual populates auto(1fr) to be 1fr(1fr), but we require expanding not to go over the container
+        # See Exp.2 in refs/textual_layout.py
+        if not parent.expand_x and expand < 3:
+            return False
+
+        return expand
 
     @property
     def expand_y(self):
-        return self.strong_expand_y or (self.weak_expand_y and not self.nweak_expand_y)
+        parent = self.cached_tparent
+        expand = self.expand_y_prio
+        if not parent:
+            return False
+
+        # textual handles 1fr as shrinkable, but we need scrolller's content not to shrink
+        # See Exp.1 in refs/textual_layout.py
+        if parent.scroll:
+            return False
+
+        # textual populates auto(1fr) to be 1fr(1fr), but we require expanding not to go over the container
+        # See Exp.2 in refs/textual_layout.py
+        if not parent.expand_y and expand < 3:
+            return False
+
+        return expand
 
     def tremove(self):
         self.ui.remove()
@@ -30,57 +63,58 @@ class TBase(PUINode):
         return super().destroy(direct)
 
     def update(self, prev):
-        parent = self.tparent
+        super().update(prev)
+
+        self.cached_tparent = parent = self.tparent
         if parent:
-            if not parent.scroll and len(parent.children) == 1:
-                if parent.expand_x:
-                    self.strong_expand_x = True
-                if parent.expand_y:
-                    self.strong_expand_y = True
+            if self.layout_weight:
+                if parent.container_x:
+                    self.expand_x_prio = 4
+                if parent.container_y:
+                    self.expand_y_prio = 4
+
+            if self.expand_x_prio >= 1:
+                parent.expand_x1_children += 1
+            if self.expand_x_prio >= 2:
+                parent.expand_x2_children += 1
+            if self.expand_x_prio >= 3:
+                parent.expand_x3_children += 1
+            if self.expand_x_prio >= 4:
+                parent.expand_x4_children += 1
+
+            if self.expand_y_prio >= 1:
+                parent.expand_y1_children += 1
+            if self.expand_y_prio >= 2:
+                parent.expand_y2_children += 1
+            if self.expand_y_prio >= 3:
+                parent.expand_y3_children += 1
+            if self.expand_y_prio >= 4:
+                parent.expand_y4_children += 1
 
-            # request expanding from inside
+    def postUpdate(self):
+        super().postUpdate()
+        parent = self.cached_tparent
+        if parent:
             if parent.container_x:
-                if parent.expand_y:
-                    self.strong_expand_y = True
-                if self.layout_weight:
-                    self.strong_expand_x = True
-                    parent.strong_expand_x_children += 1
-                    p = parent
-                    while p:
-                        if isinstance(p, TBase):
-                            p.weak_expand_x = True
-                        if p==p.parent:
-                            break
-                        p = p.parent
+                if self.expand_x_prio < 1 and parent.expand_x1_children > 0:
+                    self.expand_x_prio = 0
+                if self.expand_x_prio < 2 and parent.expand_x2_children > 0:
+                    self.expand_x_prio = 0
+                if self.expand_x_prio < 3 and parent.expand_x3_children > 0:
+                    self.expand_x_prio = 0
+                if self.expand_x_prio < 4 and parent.expand_x4_children > 0:
+                    self.expand_x_prio = 0
 
             if parent.container_y:
-                if parent.expand_x:
-                    self.strong_expand_x = True
-                if self.layout_weight:
-                    self.strong_expand_y = True
-                    parent.strong_expand_y_children += 1
-                    p = parent
-                    while p:
-                        if isinstance(p, TBase):
-                            p.weak_expand_y = True
-                        if p==p.parent:
-                            break
-                        p = p.parent
-
-            if parent.strong_expand_x_children > 0:
-                self.nweak_expand_x = True
-            if parent.strong_expand_y_children > 0:
-                self.nweak_expand_y = True
-
-        else:
-            # mark root node as expanding
-            self.strong_expand_x = True
-            self.strong_expand_y = True
+                if self.expand_y_prio < 1 and parent.expand_y1_children > 0:
+                    self.expand_y_prio = 0
+                if self.expand_y_prio < 2 and parent.expand_y2_children > 0:
+                    self.expand_y_prio = 0
+                if self.expand_y_prio < 3 and parent.expand_y3_children > 0:
+                    self.expand_y_prio = 0
+                if self.expand_y_prio < 4 and parent.expand_y4_children > 0:
+                    self.expand_y_prio = 0
 
-        super().update(prev)
-
-    def postUpdate(self):
-        super().postUpdate()
         self.t_update_layout()
 
     @property
@@ -106,8 +140,9 @@ class TBase(PUINode):
             height = "1fr"
 
         if self._debug:
-            print("layout", self.key, f"{width}:{height} expand_x={self.expand_x}", f"expand_y={self.expand_y}", f"strong_x={self.strong_expand_x}", f"weak_x={self.weak_expand_x}", f"hug_x={self.nweak_expand_x}", f"strong_y={self.strong_expand_y}", f"weak_y={self.weak_expand_y}", f"hug_y={self.nweak_expand_y}")
-        self.ui.set_styles(f"width:{width};height:{height};")
+            print("layout", self.key, f"{width}:{height} expand_x={self.expand_x}", f"expand_y={self.expand_y}", f"expand_x_prio={self.expand_x_prio}", f"expand_y_prio={self.expand_y_prio}")
+        self.ui.styles.width = width
+        self.ui.styles.height = height
 
 class TPUIView(PUIView):
     pui_virtual = True

PUI/textual/label.py

@@ -13,13 +13,12 @@ class Label(TBase):
             self.widget = prev.widget
         else:
             self.ui = containers.Container()
-            self.ui.set_styles("width: auto; height: auto;")
         if self._onClicked:
             if self.widget is None or not isinstance(self.widget, widgets.Button):
                 if self.widget:
                     self.widget.remove()
                 self.widget = widgets.Button(self.text)
-                self.widget.set_styles("height: auto; border-top: none; border-bottom: none;")
+                self.widget.set_styles("border-top: none; border-bottom: none;")
                 self.widget.puinode = self
             else:
                 self.widget.label = self.text
@@ -33,4 +32,5 @@ class Label(TBase):
         super().update(prev)
 
     def postUpdate(self):
+        super().postUpdate()
         self.ui.mount(self.widget)

PUI/textual/layout.py

@@ -3,6 +3,8 @@ from .base import *
 
 class VBox(TBase):
     container_y = True
+    expand_x_prio = 1
+    expand_y_prio = 2
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
@@ -20,6 +22,8 @@ class VBox(TBase):
 
 class HBox(TBase):
     container_x = True
+    expand_x_prio = 2
+    expand_y_prio = 1
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui

PUI/textual/scroll.py

@@ -4,8 +4,6 @@ import math
 
 class Scroll(TBase):
     END = -0.0
-    weak_expand_x = True
-    weak_expand_y = True
     scroll = True
     def __init__(self, vertical=None, horizontal=False):
         self.vertical = vertical
@@ -19,23 +17,27 @@ class Scroll(TBase):
             self.ui = prev.ui
         else:
             self.ui = containers.ScrollableContainer()
+
         v = "auto"
         self.container_y = True
+        self.expand_y_prio = 3
         if self.vertical is True:
             v = "scroll"
         elif self.vertical is False:
             v = "hidden"
             self.container_y = False
-            self.nweak_expand_y = True # discard weak_expand_x from self
+            self.expand_y_prio = 1
 
         h = "auto"
         self.container_x = True
+        self.expand_x_prio = 3
         if self.horizontal is True:
             h = "scroll"
         elif self.horizontal is False:
             h = "hidden"
             self.container_x = False
-            self.nweak_expand_x = True # discard weak_expand_y from self
+            self.expand_x_prio = 1
+
         self.ui.set_styles(f"overflow-x: {h}; overflow-y: {v};")
 
         super().update(prev)

PUI/tkinter/canvas.py

@@ -3,6 +3,9 @@ from .base import *
 import itertools
 class Canvas(TkBaseWidget):
     pui_terminal = True
+    expand_x_prio = 2
+    expand_y_prio = 2
+
     def __init__(self, painter, *args):
         super().__init__()
         self.painter = painter

PUI/wx/base.py

@@ -45,74 +45,86 @@ class WxPUIView(PUIView):
 
 class WXBase(PUINode):
     scroll = False
-    container_x = False
-    container_y = False
-    strong_expand_x = False
-    strong_expand_y = False
-    weak_expand_x = False
-    weak_expand_y = False
-    nweak_expand_x = False
-    nweak_expand_y = False
-    strong_expand_x_children = 0
-    strong_expand_y_children = 0
+    container_x = False # axis
+    container_y = False # axis
+    expand_x_prio = 0
+    expand_y_prio = 0
+    expand_x1_children = 0
+    expand_x2_children = 0
+    expand_x3_children = 0
+    expand_x4_children = 0
+    expand_y1_children = 0
+    expand_y2_children = 0
+    expand_y3_children = 0
+    expand_y4_children = 0
+    cached_wxparent = None
 
     @property
     def expand_x(self):
-        return self.strong_expand_x or (self.weak_expand_x and not self.nweak_expand_x)
+        return self.expand_x_prio
 
     @property
     def expand_y(self):
-        return self.strong_expand_y or (self.weak_expand_y and not self.nweak_expand_y)
+        return self.expand_y_prio
 
     def update(self, prev):
+        self.cached_wxparent = parent = self.wxparent
+
         parent = self.wxparent
         if parent:
-            if not parent.scroll and len(parent.children) == 1:
-                if parent.expand_x:
-                    self.strong_expand_x = True
-                if parent.expand_y:
-                    self.strong_expand_y = True
+            if self.layout_weight:
+                if parent.container_x:
+                    self.expand_x_prio = 4
+                if parent.container_y:
+                    self.expand_y_prio = 4
+
+            if self.expand_x_prio >= 1:
+                parent.expand_x1_children += 1
+            if self.expand_x_prio >= 2:
+                parent.expand_x2_children += 1
+            if self.expand_x_prio >= 3:
+                parent.expand_x3_children += 1
+            if self.expand_x_prio >= 4:
+                parent.expand_x4_children += 1
+
+            if self.expand_y_prio >= 1:
+                parent.expand_y1_children += 1
+            if self.expand_y_prio >= 2:
+                parent.expand_y2_children += 1
+            if self.expand_y_prio >= 3:
+                parent.expand_y3_children += 1
+            if self.expand_y_prio >= 4:
+                parent.expand_y4_children += 1
+
+        super().update(prev)
 
-            # request expanding from inside
+    def postUpdate(self):
+        parent = self.cached_wxparent
+        if parent:
             if parent.container_x:
-                if parent.expand_y:
-                    self.strong_expand_y = True
-                if self.layout_weight:
-                    self.strong_expand_x = True
-                    parent.strong_expand_x_children += 1
-                    p = parent
-                    while p:
-                        if isinstance(p, WXBase):
-                            p.weak_expand_x = True
-                        if p==p.parent:
-                            break
-                        p = p.parent
+                if self.expand_x_prio < 1 and parent.expand_x1_children > 0:
+                    self.expand_x_prio = 0
+                if self.expand_x_prio < 2 and parent.expand_x2_children > 0:
+                    self.expand_x_prio = 0
+                if self.expand_x_prio < 3 and parent.expand_x3_children > 0:
+                    self.expand_x_prio = 0
+                if self.expand_x_prio < 4 and parent.expand_x4_children > 0:
+                    self.expand_x_prio = 0
 
             if parent.container_y:
-                if parent.expand_x:
-                    self.strong_expand_x = True
-                if self.layout_weight:
-                    self.strong_expand_y = True
-                    parent.strong_expand_y_children += 1
-                    p = parent
-                    while p:
-                        if isinstance(p, WXBase):
-                            p.weak_expand_y = True
-                        if p==p.parent:
-                            break
-                        p = p.parent
-
-            if parent.strong_expand_x_children > 0:
-                self.nweak_expand_x = True
-            if parent.strong_expand_y_children > 0:
-                self.nweak_expand_y = True
+                if self.expand_y_prio < 1 and parent.expand_y1_children > 0:
+                    self.expand_y_prio = 0
+                if self.expand_y_prio < 2 and parent.expand_y2_children > 0:
+                    self.expand_y_prio = 0
+                if self.expand_y_prio < 3 and parent.expand_y3_children > 0:
+                    self.expand_y_prio = 0
+                if self.expand_y_prio < 4 and parent.expand_y4_children > 0:
+                    self.expand_y_prio = 0
 
-        else:
-            # mark root node as expanding
-            self.strong_expand_x = True
-            self.strong_expand_y = True
+        if self._debug:
+            print("layout", self.key, f"weight={self.layout_weight}", f"expand_x={self.expand_x}", f"expand_y={self.expand_y}")
 
-        super().update(prev)
+        super().postUpdate()
 
     @property
     def wxparent(self):
@@ -153,6 +165,7 @@ class WxBaseWidget(WXBase):
 class WxBaseLayout(WXBase):
     def __init__(self):
         super().__init__()
+        self.relayout = False
         if not isinstance(self.non_virtual_parent, WxBaseLayout):
             self.layout_padding = (11,11,11,11)
 
@@ -161,8 +174,38 @@ class WxBaseLayout(WXBase):
         self.ui = None
         super().destroy(direct)
 
+    def update(self, prev):
+        if prev and prev.ui:
+            self.sizerItems = prev.sizerItems
+        else:
+            self.sizerItems = []
+        super().update(prev)
+
+    def postUpdate(self):
+        super().postUpdate()
+
+        for child, si in self.sizerItems:
+            if child.expand_x or child.expand_y:
+                si.SetFlag(wx.ALL | wx.EXPAND)
+            else:
+                # si.SetFlag(wx.ALL | wx.ALIGN_CENTER)
+                si.SetFlag(wx.ALL) # XXX
+
+            weight = child.layout_weight
+            if self.container_x and child.expand_x:
+                si.SetProportion(weight if weight else 1 if child.expand_x  else 0)
+            elif self.container_y and child.expand_y:
+                si.SetProportion(weight if weight else 1 if child.expand_y  else 0)
+
+            p = 0
+            if child.layout_padding:
+                p = max(child.layout_padding)
+            si.SetBorder(p)
+
     def addChild(self, idx, child):
         from .layout import Spacer
+        self.relayout = True
+
         weight = child.layout_weight
         if weight is None:
             weight = 0
@@ -170,33 +213,34 @@ class WxBaseLayout(WXBase):
             weight = 1
         if not weight and self.container_y and child.expand_y:
             weight = 1
-        flag = wx.ALL
 
-        p = 0
-        if child.layout_padding:
-            p = max(child.layout_padding)
         if isinstance(child, WxBaseLayout):
-            self.ui.Insert(idx, child.outer, proportion=weight, flag=flag|wx.EXPAND, border=p)
+            si = self.ui.Insert(idx, child.outer)
+            self.sizerItems.insert(idx, (child, si))
         elif isinstance(child, WxBaseWidget):
-            if child.expand_x or child.expand_y or child.weak_expand_x or child.weak_expand_y:
-                flag |= wx.EXPAND
-            else:
-                flag |= wx.ALIGN_CENTER
-            self.ui.Insert(idx, child.outer, proportion=weight, flag=flag, border=p)
+            si = self.ui.Insert(idx, child.outer)
+            self.sizerItems.insert(idx, (child, si))
         elif isinstance(child, Spacer):
-            self.ui.InsertStretchSpacer(idx, weight)
+            si = self.ui.InsertStretchSpacer(idx)
+            self.sizerItems.insert(idx, (child, si))
 
     def removeChild(self, idx, child):
+        self.relayout = True
+
         from .layout import Spacer
         if isinstance(child, WxBaseLayout):
             self.ui.Detach(idx)
+            self.sizerItems.pop(idx)
         elif isinstance(child, WxBaseWidget):
             self.ui.Detach(idx)
+            self.sizerItems.pop(idx)
         elif isinstance(child, Spacer):
             self.ui.Detach(idx)
+            self.sizerItems.pop(idx)
 
     def postSync(self):
-        if self.ui:
+        if self.relayout and self.ui:
+            self.relayout = False
             self.ui.Layout()
-            self.ui.Fit(getWindow(self.parent))
+            # self.ui.Fit(getWindow(self.parent))
         super().postSync()

PUI/wx/canvas.py

@@ -3,8 +3,8 @@ from .base import *
 import math
 
 class Canvas(WxBaseWidget):
-    weak_expand_x = True
-    weak_expand_y = True
+    expand_x_prio = 3
+    expand_y_prio = 3
 
     def __init__(self, painter, *args):
         super().__init__()

PUI/wx/combobox.py

@@ -17,20 +17,23 @@ class ComboBox(WxBaseWidget):
         else:
             self.curr_index = Prop()
             self.curr_text = Prop()
-            self.ui = wx.ComboBox(getWindow(self.parent), choices=[])
+            self.ui = wx.ComboBox(getWindow(self.parent), choices=[], style=0 if self.editable else wx.CB_READONLY)
             self.ui.Bind(wx.EVT_COMBOBOX, self._combobox)
             self.ui.Bind(wx.EVT_TEXT, self._text)
 
         super().update(prev)
 
     def postSync(self):
+        index = 0
+        text = ""
+
         if self.index_model:
             index = self.index_model.value
             text = self.children[index].text
         elif self.text_model:
             text = str(self.text_model.value)
             try:
-                index = [c.text for c in self.children].index(text)
+                index = [c.value for c in self.children].index(text)
             except:
                 index = 0
 
@@ -45,11 +48,15 @@ class ComboBox(WxBaseWidget):
         idx = self.ui.GetSelection()
         if node.index_model:
             node.index_model.value = idx
+        if node.text_model:
+            node.text_model.value = self.children[idx].value
         e = PUIEvent()
         e.value = idx
         node._change(e)
 
     def _text(self, *args, **kwargs):
+        if not self.editable:
+            return
         node = self.get_node()
         text = self.ui.GetValue()
         if node.text_model:
@@ -64,9 +71,11 @@ class ComboBox(WxBaseWidget):
     def removeChild(self, idx, child):
         self.ui.Delete(idx)
 
-
 class ComboBoxItem(PUINode):
-    def __init__(self, text):
+    def __init__(self, text, value=None):
         super().__init__()
         self.id(text)
         self.text = text
+        if value is None:
+            value = text
+        self.value = value

PUI/wx/layout.py

@@ -3,6 +3,9 @@ from .base import *
 
 class HBox(WxBaseLayout):
     container_x = True
+    expand_x_prio = 2
+    expand_y_prio = 1
+
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
@@ -12,6 +15,9 @@ class HBox(WxBaseLayout):
 
 class VBox(WxBaseLayout):
     container_y = True
+    expand_x_prio = 1
+    expand_y_prio = 2
+
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui

PUI/wx/scroll.py

@@ -4,8 +4,6 @@ import wx.lib.scrolledpanel as scrolled
 
 class Scroll(WxBaseWidget):
     pui_terminal = False
-    weak_expand_x = True
-    weak_expand_y = True
     scroll = True
 
     END = -0.0
@@ -20,6 +18,19 @@ class Scroll(WxBaseWidget):
             self.ui = prev.ui
         else:
             self.ui = scrolled.ScrolledPanel(getWindow(self.parent))
+
+        self.container_y = True
+        self.expand_y_prio = 3
+        if self.vertical is False:
+            self.container_y = False
+            self.expand_y_prio = 1
+
+        self.container_x = True
+        self.expand_x_prio = 3
+        if self.horizontal is False:
+            self.container_x = False
+            self.expand_x_prio = 1
+
         super().update(prev)
 
     def addChild(self, idx, child):

{qpuiq-0.12.dist-info → qpuiq-0.14.dist-info}/METADATA

@@ -1,12 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: qpuiq
-Version: 0.12
+Version: 0.14
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu
 Author-email: buganini@b612.tw
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: summary
 
 # What is PUI
 PUI is a reactive/declarative UI framework with two-way data binding.
@@ -205,8 +212,9 @@ Then PUI will take care of view update [(code)](https://github.com/buganini/PUI/
 * textual (Text Mode)
     * no canvas
 
-# Components
-[Reference](REFERENCE.md)
+# Documents
+* [Components Reference](REFERENCE.md)
+* [Sizing Strategy](https://html-preview.github.io/?url=https://github.com/buganini/PUI/blob/main/doc/Sizing.html)
 
 # Used by
 * https://github.com/buganini/kikit-ui

{qpuiq-0.12.dist-info → qpuiq-0.14.dist-info}/RECORD

@@ -1,5 +1,5 @@
-PUI/__init__.py,sha256=XdqoyAVcheQeWKq1l0qpLMN6jfHigBEh9fskePCjnB8,966
-PUI/common.py,sha256=iCMdJPgdKxnZObpjjYzxa_LN8eS4w0FOTfgaDwD_fGY,500
+PUI/__init__.py,sha256=1cYRM8ouBVNa_BIQAMNzSyQJ5Ym-NMT-IL5Zp5mctfk,966
+PUI/common.py,sha256=fUJmHOu5lSCeiOhFDF6YqulJxFqWmsneqnDZ2kZFFmM,581
 PUI/decorator.py,sha256=BN3POYv69QCDomoHENN-UA-d4wY_vfARIb5RJ2qEnS8,483
 PUI/dom.py,sha256=RgdDyv6vSFgkCoj9G2cjzQQOiymG8DwmmSoAZfxYvJM,10141
 PUI/interfaces.py,sha256=rGUciM3S6ICEVgVoahkva8yXUGpweqy1kAzhUQut40E,2182
@@ -10,16 +10,16 @@ PUI/utils.py,sha256=canb7_Uz0sQ1UZDzyDuIsfAVXzEfZCkc9F81sMY4rTE,505
 PUI/view.py,sha256=Oe6sXLHD554GnlLlO5QpY7kegngkzrmMEYRHrdzGZUQ,4623
 PUI/PySide6/__init__.py,sha256=z895ldBVUaEqfGQW4CvYhWh2F6L0qGQA1MXUHVMf9Ms,1110
 PUI/PySide6/application.py,sha256=OsIE47efST4I13txD-7rS1cTWAGhynckl45Wdb1bafk,1471
-PUI/PySide6/base.py,sha256=wAkvN_dxG8fKHUNH99lO2Kc9ZEENQFDkPt1hkDFSBLM,7910
+PUI/PySide6/base.py,sha256=bhIxbw16l78lgkSpN4_s2cV33pObj3O3yGhtiNIJ10w,7916
 PUI/PySide6/button.py,sha256=mHfcH98dABYgksuT58fK0amSwtCM9aaYwr7Y2EArEJA,561
-PUI/PySide6/canvas.py,sha256=mkMjGXcQmUeV1a1HChv6KTWuh_5ao_qA-dYqCnsHo3s,9108
+PUI/PySide6/canvas.py,sha256=Qad87bLpQJoh8U5hjqH3g3mSbodPwweT0TOqnB5LPyI,10416
 PUI/PySide6/checkbox.py,sha256=Rsns0BleE4g9yTDdlsD8IADU3qcQkVO2VsFVvYlNL88,900
-PUI/PySide6/combobox.py,sha256=mn1u4SATJbL1YVlnIecyHklRjUoXumwiyHalF3qInA0,2235
+PUI/PySide6/combobox.py,sha256=mAfJ_7m-jTWBAh2Sng-BslY-_7EjIwRLbrx5IHik13I,2501
 PUI/PySide6/dialog.py,sha256=4rAyLMqd47ALDxrBGLFHS5FD75SP1I8tkMSKBdaPkv0,2364
 PUI/PySide6/divider.py,sha256=jRR8Qtdil-8JTxj8SyJydzRB_MGTKa_TxegsqkYKcXc,733
-PUI/PySide6/image.py,sha256=0HpyNX-iMGy-yVyanAmnQj4q-bvxJc3k9MY5tNlpiXE,1159
+PUI/PySide6/image.py,sha256=uORM63K6v-1Ug4KpRJW3YHc-PpICqmRxmAzcEL6MaME,1969
 PUI/PySide6/label.py,sha256=_G8bckRPPQdzZTS3j9JaOmfRAnLragBXnyJUG9_kblU,1038
-PUI/PySide6/layout.py,sha256=hSnDmrir2ztgyj1gQchniwMfjcKM1GtKeXRU9YOM4QE,2617
+PUI/PySide6/layout.py,sha256=lEr37sxpYWHSo_d-8asPRVjnJsiePP4g9SaKFGLCpJs,2637
 PUI/PySide6/matplotlib.py,sha256=fzVfwgmEX7s_WDtc_JULRdBOfZgcBewiH79f4ahZHQ4,825
 PUI/PySide6/mdi.py,sha256=OGE2-5--Cy-srAzM-ZexnJ1efeORQvlsH2UA7qp18iE,805
 PUI/PySide6/menu.py,sha256=Qbw_0WX56vzC2vkvn-4DXzYX0vZ-4Rq6tW1Kj_M-Qb8,2806
@@ -33,7 +33,7 @@ PUI/PySide6/table.py,sha256=TTCMf_YNKmkFiqs_qLqw3qbvFsxoBNnz9VMObx_2l3s,4800
 PUI/PySide6/text.py,sha256=4kRRZiuH-bLLJMNZ6hK9zAWOorsG-l4uujHbG6I5S20,1069
 PUI/PySide6/textfield.py,sha256=Us-UZMDCwrREwFLjPKKa3e3c_1U4WWD2kzFCe3xiY0k,2140
 PUI/PySide6/toolbar.py,sha256=NPkn99D5xK4RLBA0vxLD7EqYu5eh9ucCL2y1vSJWQl4,1800
-PUI/PySide6/tree.py,sha256=G25bnOaKuI6rwyU745av8K6bH-Os0hMPcRxOqMoB47A,8915
+PUI/PySide6/tree.py,sha256=skMsCykh8kWXFTg4Yv--PevJ58fqEeZV566ICjBVO4E,9324
 PUI/PySide6/window.py,sha256=CpkIFpleVr3oXOM6vdukahWtX5SV6cWNc1TUW84JPM4,2694
 PUI/flet/__init__.py,sha256=3YzGA0oPfu9eW8DtKQSoAsa8o6ZTGKWakYBTxGaaH8Y,438
 PUI/flet/application.py,sha256=3ZGZrAngSEkVK-WseOV-n_6ljhd86ZKBgO6Jp2PmsJA,937
@@ -50,16 +50,16 @@ PUI/flet/tab.py,sha256=T26PZ-Ma_LPUx7u9qbxEnYqxuR1-qlytWiB9TDpu7G8,997
 PUI/flet/text.py,sha256=HGnhOTDwG5pqceK8x_C6wCZj1AKuqZ9vEZB_NFwXZo4,1465
 PUI/flet/textfield.py,sha256=7BPRrdf4pv8rDM5BpZzMQ9b456kZpXm81y7sVW3K4XM,1802
 PUI/flet/window.py,sha256=NqUnGYvhk2Mpo_G2WthZOEvlU6VMx6AM-jWMKcUqGDM,650
-PUI/textual/__init__.py,sha256=uj_j3Z3Jvt-OLG5WSuD8mQW3rqRlv5oi7pwxKfoGFfk,709
+PUI/textual/__init__.py,sha256=cPf0_BXd2Q-6w-0UHyxFQ6QLfTVDaoo7XmSCW_1kpyc,732
 PUI/textual/application.py,sha256=FNpZ1j05EbE3XNxqMBDfsU_IPQ1k2Y7xw-5KLtwuFnI,2514
-PUI/textual/base.py,sha256=uZhtB7Ofajc--bCilWsOGP63AxBL59y744GZFa13eIA,3580
+PUI/textual/base.py,sha256=W0tfxGlZErrsCoLb9IuFjgmNa93vZFCYNgZr1V6VEjE,4821
 PUI/textual/button.py,sha256=VF7fmgi5mHeOzptZzy4oBfcuCeUURq5eFrLvN4Fgg30,436
 PUI/textual/checkbox.py,sha256=pkBxZz0qXl2KUz2-Lqap-r2Y3DBI0CET3wQgEpYKb7U,518
-PUI/textual/label.py,sha256=Ce5I-1sBeaKnLEIsQWK5nKMCEgwusED2fjHePIiGr90,1266
-PUI/textual/layout.py,sha256=poeS1TrbqR4wBiP7jj31sSr2fRav2w59-MIWZwvtZUI,1214
+PUI/textual/label.py,sha256=3kwUerDSbyUPPEkLsjs0qDcyyhgOvUws2wtjovyf0_k,1220
+PUI/textual/layout.py,sha256=xS3xa7UHyfKT93zW2592lV7iu6POuRJKLGyvRvtHIlQ,1302
 PUI/textual/progressbar.py,sha256=aeLiXzLOj3VWR-KUEBmmEOxJR0LACr1_-MDMOYDHx9c,501
 PUI/textual/radiobutton.py,sha256=zFKG2LeUnPXnxpxeW3cYqPwd91DQZWFUctundau-4b0,621
-PUI/textual/scroll.py,sha256=QeMDXgIz-5fxcL4htM2pHJFD6RAsDiijgLO9PmhJOEA,2036
+PUI/textual/scroll.py,sha256=u6-tFygXZR_giVsCaePahKxTb0xTbdBHCNisQA9jpWc,1974
 PUI/textual/tab.py,sha256=wcvyH1MZZNwwout8iJDifty_lqe6YuhfRpE3F0lUTBM,2158
 PUI/textual/text.py,sha256=BHvgK3JqBU_LrnWbaaKBFxQ_50Z9lFhcdEJoVJqbcSc,782
 PUI/textual/textfield.py,sha256=u01i-fhtSEMi_6F_bPWgf5TvRUQvuudaxi58Yp6WTbg,1412
@@ -68,7 +68,7 @@ PUI/tkinter/__init__.py,sha256=VQjdak9UO-zI7n9Kr4q_B-kgCXgag2DVoWWP_QdH2uk,982
 PUI/tkinter/application.py,sha256=NxWfU9NHJuceKMdLiGeklUKU5WjYVUomGL_hJpRtrbs,1141
 PUI/tkinter/base.py,sha256=jSOKxd2uMOhVvDjBOloxdiHeNvKwEoWJo0fyVH49ttI,2663
 PUI/tkinter/button.py,sha256=zRGt_jVY6q74Jer5jm4q4H-_LznrXUzfEQwiMWtQboI,467
-PUI/tkinter/canvas.py,sha256=AHltKAeKP629qfosJNy9jaLwLygwtHv88aPGGt6PSgE,1609
+PUI/tkinter/canvas.py,sha256=nLi46ZhgEvpZz8_aUy1DwfKct4zdABjqL-9ObS1CCMM,1654
 PUI/tkinter/checkbox.py,sha256=TOYOCKx9ux58YdYWXLkjguFG3NsgVaYlFOIrZ9ukcwI,741
 PUI/tkinter/label.py,sha256=o6hj-8qX0ZwDDbYaNsTz5oUIXKJFr-HctTeZW2NfhHE,555
 PUI/tkinter/layout.py,sha256=q1NgGlPd_dn1avIzJBeO_46NyBPCQyh3VcQ56YmUUKE,3576
@@ -81,23 +81,23 @@ PUI/tkinter/textfield.py,sha256=-jab7t5-wpIejINRftXczv0685cze-H7pm3lWigOT5w,1788
 PUI/tkinter/window.py,sha256=IIieSxxanhGIvPy0krQuLrStsL_jTUdx6TKbEf64nyQ,1606
 PUI/wx/__init__.py,sha256=j8L1kzL4CK_xeF0x5_NZekGETYP_1Dhq3-BuV1LtXoY,391
 PUI/wx/application.py,sha256=Ku_mloCyiw-KTl8a09uTIhV7uupG_7urqw8jXIwQMLc,965
-PUI/wx/base.py,sha256=kvpi2WVgDMW4LqaYiMhEIb0FlRG2pXvYUV04iJ_oSV4,6089
+PUI/wx/base.py,sha256=3NKfMbfuH9qClFBP5bVIQtJyhnGRqsNuXwY0vvlyFnU,7596
 PUI/wx/button.py,sha256=ww3Iyn16zomP4zkQhvXTirmHBvlVMJxmiV1pfXtgrSo,447
-PUI/wx/canvas.py,sha256=1mWdzlMfIIe--Lx4npzo0vX2BjvijZkQDep6-AmYcdM,8493
+PUI/wx/canvas.py,sha256=uL4z0ghM15IWNlvmDyV3lVw8Li4RNMJWXHvwd7jZSiw,8487
 PUI/wx/checkbox.py,sha256=XgLxsi-tk2f9bnlEvhvEZV4boBGFB3u62ZE1cs8X9tU,674
-PUI/wx/combobox.py,sha256=Q4KN8P3yO7KI5nKebSDYHu0noAyv-NtObkxmOsa_RrI,2052
+PUI/wx/combobox.py,sha256=FoYn6AkPpxH2jHcZEp20a_peC7MbTx4MUPtbGzOskcI,2363
 PUI/wx/dialog.py,sha256=HVLVdzRkZhRndkHTYl0RgNfzIQBdtik7DIDg93Dp9JA,2572
 PUI/wx/divider.py,sha256=qnaUVpspAOND6YhZyQsZeos1LC02L-ljfdAtVp1vdzw,516
 PUI/wx/label.py,sha256=qr3hGfHtjvYjeXJSB2cD5u30LYodEzix4Q0FYw8p6p0,509
-PUI/wx/layout.py,sha256=jzik7K_Vfjh7uVZbZn2erqwWvILzPCP0xurcGQb4kYI,1370
+PUI/wx/layout.py,sha256=nVO31_Xu4aDcTLxlz66DJ5PK2RPHk0yq6qdzyWuGVz8,1460
 PUI/wx/progressbar.py,sha256=gj5j6f-zG78XW1mEIRqiOEYMoYjG16jzS44Vnh4i148,472
 PUI/wx/radiobutton.py,sha256=x7WnCGXuNPV98MqF-tRLzMOOExim22rayNL8jAYVZWk,769
-PUI/wx/scroll.py,sha256=LPwRL9KZuoKrTFEWo1_zW3l_Fbaznq_2jA9GuwTp8Dc,1199
+PUI/wx/scroll.py,sha256=pvRmt04XEgObpIgwl9i52Kf1wI9ubUfZM77fPHGW9zU,1494
 PUI/wx/text.py,sha256=YeIyDyHH0xBcD_iXbYSTtvL25YDtug1QJNVPvCSAqEk,544
 PUI/wx/textfield.py,sha256=BmMebfqlDJqacaKdh2SON88xF73l0csC7L7hoNjz-qs,1778
 PUI/wx/window.py,sha256=juAsn3W4SzmH8f5LDGvjwppvPD8fDObRUJ_MkQFKCIE,1847
-qpuiq-0.12.dist-info/LICENSE.txt,sha256=1Xwik2AmLNGoIYhAPzvNC28M08Q3EvkOe4TtlQuSd_E,1072
-qpuiq-0.12.dist-info/METADATA,sha256=0nqLbJxZZ-b2P_xn5Yu6DJTa3jTzNMTUaYIbcNCrjWs,5716
-qpuiq-0.12.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-qpuiq-0.12.dist-info/top_level.txt,sha256=zMudhifPite0CEVGYvdi-5W3P_dpum71xjU7_g-ZHS0,4
-qpuiq-0.12.dist-info/RECORD,,
+qpuiq-0.14.dist-info/licenses/LICENSE.txt,sha256=1Xwik2AmLNGoIYhAPzvNC28M08Q3EvkOe4TtlQuSd_E,1072
+qpuiq-0.14.dist-info/METADATA,sha256=EkKi_IUa4vM9PyZY2A8n5vTgZLXCnDnR8QGX1cZQR1s,5994
+qpuiq-0.14.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+qpuiq-0.14.dist-info/top_level.txt,sha256=zMudhifPite0CEVGYvdi-5W3P_dpum71xjU7_g-ZHS0,4
+qpuiq-0.14.dist-info/RECORD,,

{qpuiq-0.12.dist-info → qpuiq-0.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any