Width of a vertical combo. is the MAXimum of all subwindow widths.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 16 Sep 2011 18:59:44 +0000 (11:59 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Fri, 16 Sep 2011 18:59:44 +0000 (11:59 -0700)
src/gtk-screen/gtk-screen.scm

index 49f687acd577596387cb4c92576cb144c8a63dd3..86d5073816ac65af7a62952271b34b092cc4a905 100644 (file)
@@ -1108,24 +1108,24 @@ USA.
              (if vertical?
                  (let ((x-size (%window-x-size child))
                        (y-size (%window-y-size child)))
-                   (if (not total-x-size)
-                       (set! total-x-size x-size)
-                       (if (not (fix:= x-size total-x-size))
-                           (warn "Wrong Edwin window width:"
-                                 x-size total-x-size window)))
-                   (if (not total-y-size)
-                       (set! total-y-size y-size)
-                       (set! total-y-size (fix:+ total-y-size y-size))))
+                   (set! total-x-size
+                         (if (not total-x-size)
+                             x-size
+                             (fix:max x-size total-x-size)))
+                   (set! total-y-size
+                         (if (not total-y-size)
+                             y-size
+                             (fix:+ total-y-size y-size))))
                  (let ((x-size (%window-x-size child))
                        (y-size (%window-y-size child)))
-                   (if (not total-y-size)
-                       (set! total-y-size y-size)
-                       (if (not (fix:= y-size total-y-size))
-                           (warn "Wrong height:"
-                                 y-size total-y-size window)))
-                   (if (not total-x-size)
-                       (set! total-x-size x-size)
-                       (set! total-x-size (fix:+ total-x-size x-size)))))))
+                   (set! total-y-size
+                         (if (not total-y-size)
+                             y-size
+                             (fix:max y-size total-y-size)))
+                   (set! total-x-size
+                         (if (not total-x-size)
+                             x-size
+                             (fix:+ total-x-size x-size)))))))
          (window-inferiors window))
        (%trace ";   "prefix""window": "total-x-size"x"total-y-size"\n")
        (%set-window-x-size! window total-x-size)