[gnue] r9422 - trunk/gnue-forms/src/uidrivers/qt3/widgets

[johannes]

Author: johannes
Date: 2007-03-02 02:34:44 -0600 (Fri, 02 Mar 2007)
New Revision: 9422

Modified:
   trunk/gnue-forms/src/uidrivers/qt3/widgets/box.py
   trunk/gnue-forms/src/uidrivers/qt3/widgets/page.py
Log:
Don't vertically center contents of boxes in positioned layout.  This 
makes sure that entries within neighboring boxes start at the same 
position.


Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/box.py   2007-03-02 08:23:41 UTC 
(rev 9421)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/box.py   2007-03-02 08:34:44 UTC 
(rev 9422)
@@ -53,7 +53,13 @@
         self.widget.setFixedSize(self.chr_w * self._uiDriver.cell_width,
                 self.chr_h * self._uiDriver.cell_height)
 
-        self.sizer = qt.QGridLayout(self.chr_h, self.chr_w, 2)
+        # Since rows within a QGridLayout are still stretchable if none of them
+        # is set to stretchable, let's add an extra 'stretchable' row.  This
+        # way all others won't stretch and rows within neighboring boxes will
+        # start at the same vertical offsets
+        self.sizer = qt.QGridLayout(self.chr_h + 1, self.chr_w, 2)
+        self.sizer.setRowStretch(self.chr_h, 1)
+
         self._container.layout().addLayout(self.sizer)
 
         self.getParent().add_widgets(self, 0)
@@ -77,7 +83,8 @@
 
         self.sizer.addMultiCellWidget(item, ui_widget.chr_y,
                 ui_widget.chr_y + ui_widget.chr_h - 1, ui_widget.chr_x,
-                ui_widget.chr_x + ui_widget.chr_w - 1, qt.Qt.AlignLeft)
+                ui_widget.chr_x + ui_widget.chr_w - 1,
+                qt.Qt.AlignLeft | qt.Qt.AlignTop)
 
 
 

Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/page.py  2007-03-02 08:23:41 UTC 
(rev 9421)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/page.py  2007-03-02 08:34:44 UTC 
(rev 9422)
@@ -62,7 +62,8 @@
         else:
             w = getattr(self._form._layout, 'Char__width', -1)
             h = getattr(self._form._layout, 'Char__height', -1)
-            page_sizer = qt.QGridLayout(self._container, h, w, 2, 2)
+            page_sizer = qt.QGridLayout(self._container, h+1, w, 2, 2)
+            page_sizer.setRowStretch(h, 1)
 
         if isinstance(parent, qt.QTabWidget):
             title = "%s" % (self._gfObject.caption or self._gfObject.name)
@@ -95,7 +96,7 @@
         else:
             sizer.addMultiCellWidget(item, ui_widget.chr_y, ui_widget.chr_y +
                     ui_widget.chr_h - 1, ui_widget.chr_x, ui_widget.chr_x +
-                    ui_widget.chr_w - 1, qt.Qt.AlignLeft)
+                    ui_widget.chr_w - 1, qt.Qt.AlignLeft | qt.Qt.AlignTop)
     
 # =============================================================================
 # Configuration