Chain up fix-resizers via their new "before" and "after" slots.

diff --git a/src/gtk-screen/gtk-screen.pkg b/src/gtk-screen/gtk-screen.pkg
index 496da8be56dd466c9cf4c6d5cdccb8fdf6a997e3..f3041b5fd0a0b1e307056f37a816692e8d5e0e89 100644 (file)
--- a/src/gtk-screen/gtk-screen.pkg
+++ b/src/gtk-screen/gtk-screen.pkg
@@ -174,7 +174,8 @@ USA.
 
          fix-resizer?
          make-fix-resizer
-         fix-resizer-resizee set-fix-resizer-resizee!
+         fix-resizer-before set-fix-resizer-before!
+         fix-resizer-after set-fix-resizer-after!
 
          <fix-drawing> guarantee-fix-drawing
          make-fix-drawing fix-drawing-widgets

diff --git a/src/gtk-screen/gtk-screen.scm b/src/gtk-screen/gtk-screen.scm
index a049d2c95301adf5cc381d8bf55e259f4c4eff03..9583d1c8243f02a3117ec0b91933ed51b217b8cb 100644 (file)
--- a/src/gtk-screen/gtk-screen.scm
+++ b/src/gtk-screen/gtk-screen.scm
@@ -800,8 +800,8 @@ USA.
     ;; resizer (if needed), then tail-call re-pack-windows! on the
     ;; rest.
     (if (and resizer
-            (not (eq? (car widgets) (fix-resizer-resizee resizer))))
-       (set-fix-resizer-resizee! resizer (car widgets)))
+            (not (eq? (car widgets) (fix-resizer-before resizer))))
+       (set-fix-resizer-before! resizer (car widgets)))
 
     (if (and (gtk-hbox? box) (pair? (cdr windows)))
        ;; Need resizer.
@@ -811,6 +811,7 @@ USA.
          (if resizer
              (re-pack-windows! (cdr windows) (cddr widgets) box resizer prefix)
              (let ((new (make-fix-resizer (gtk-screen-char-width screen) -1)))
+               (set-fix-resizer-after! new box)
                (gtk-box-pack-end box new #f #f 0)
                (for-each
                  (lambda (w)
@@ -855,11 +856,12 @@ USA.
            (pack-new! (%reversed-children (car windows)) new #f new-prefix)
            (gtk-box-pack-end box new #t #t 0)
            (%trace ";     "prefix"packed "new" in "box"\n")
-           (if resizer (set-fix-resizer-resizee! resizer new))
+           (if resizer (set-fix-resizer-before! resizer new))
            (if (and (gtk-hbox? box) (pair? (cdr windows)))
                ;; Need resizer.
                (let ((new-resizer
                       (make-fix-resizer (gtk-screen-char-width screen) -1)))
+                 (set-fix-resizer-after! new-resizer new)
                  (gtk-box-pack-end box new-resizer #f #f 0)
                  (pack-new! (cdr windows) box new-resizer prefix))
                ;; Need NO resizer.
@@ -900,11 +902,12 @@ USA.
                  (gtk-box-pack-end vbox scroller #t #t 0)
                  (gtk-box-pack-end box vbox #t #t 0)
                  (%trace ";     "prefix"packed "vbox" into "box"\n")))
-           (if resizer (set-fix-resizer-resizee! resizer vbox))
+           (if resizer (set-fix-resizer-before! resizer vbox))
            (if (and (gtk-hbox? box) (pair? (cdr windows)))
                ;; Need resizer.
                (let ((new-resizer
                       (make-fix-resizer (gtk-screen-char-width screen) -1)))
+                 (set-fix-resizer-after! new-resizer vbox)
                  (gtk-box-pack-end box new-resizer #f #f 0)
                  (pack-new! (cdr windows) box new-resizer prefix))
                ;; Need NO resizer.