Changeset 556:07248b9b9899

Timestamp:

02/01/14 12:28:17 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Fixed problems with sizing with PyGTK (re #224)

File:

• src/mlx/gui/flight.py (modified) (6 diffs)

src/mlx/gui/flight.py

@@ -105 +105 @@
             longerHelp = completedHelp
 
-        self._helpLabel = gtk.Label(completedHelp)
+        self._helpLabel = gtk.Label(longerHelp)
         # FIXME: should be a constant in common
         self._helpLabel.set_justify(gtk.Justification.CENTER if pygobject
@@ -2814 +2814 @@
                                   xscale = 0.0, yscale = 0.0)
 
-        table = gtk.Table(8, 2)
+        table = gtk.Table(10, 2)
         table.set_row_spacings(4)
         table.set_col_spacings(16)
@@ -2845 +2845 @@
         labelAlignment = gtk.Alignment(xalign=0.0, xscale=0.0)
         self._depTime = gtk.Label()
-        self._depTime.set_width_chars(10)
+        self._depTime.set_width_chars(13)
         self._depTime.set_alignment(0.0, 0.5)
         self._depTime.set_use_markup(True)
@@ -2890 +2890 @@
         labelAlignment = gtk.Alignment(xalign=0.0, xscale=0.0)
         self._arrTime = gtk.Label()
-        self._arrTime.set_width_chars(10)
+        self._arrTime.set_width_chars(13)
         self._arrTime.set_alignment(0.0, 0.5)
         self._arrTime.set_use_markup(True)
@@ -3381 +3381 @@
         self._pages.append(self._finishPage)
 
+        self._requestedWidth = None
+        self._requestedHeight = None
+
+        self.connect("size-allocate", self._sizeAllocate)
+
+        for page in self._pages:
+            page.show_all()
+            page.setStyle()
+
+        self._initialize()
+
+    def _sizeAllocate(self, widget, allocation):
+        if self._requestedWidth is not None and \
+           self._requestedHeight is not None:
+           return
+
+        if self._currentPage is not None:
+            self.remove(self._pages[self._currentPage])
+
         maxWidth = 0
         maxHeight = 0
         for page in self._pages:
-            page.show_all()
+            self.add(page)
+            self.show_all()
             pageSizeRequest = page.size_request()
             width = pageSizeRequest.width if pygobject else pageSizeRequest[0]
@@ -3390 +3410 @@
             maxWidth = max(maxWidth, width)
             maxHeight = max(maxHeight, height)
-            page.setStyle()
-        maxWidth += 16
-        maxHeight += 32
+            self.remove(page)
+
+        if self._currentPage is not None:
+            self.add(self._pages[self._currentPage])
+
+        self._requestedWidth = maxWidth
+        self._requestedHeight = maxHeight
         self.set_size_request(maxWidth, maxHeight)
-
-        self._initialize()
 
     @property