From e3fff90178a7f9cbd040c1bd02d398d6b0bd8af3 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Fri, 16 Sep 2011 11:59:44 -0700 Subject: [PATCH] Width of a vertical combo. is the MAXimum of all subwindow widths. --- src/gtk-screen/gtk-screen.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gtk-screen/gtk-screen.scm b/src/gtk-screen/gtk-screen.scm index 49f687acd..86d507381 100644 --- a/src/gtk-screen/gtk-screen.scm +++ b/src/gtk-screen/gtk-screen.scm @@ -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) -- 2.25.1