fix incremental layout regression

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 9c63726b48c7493286fca6f694d9fc29c157aa7d..ce598e3bef0e2d966a22ad93ee52a17164c46073 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -1,4 +1,3 @@
-- finish scrollbars\r
 - fix up the min thumb size hack\r
 \r
 + ui:\r

diff --git a/library/ui/gadgets.factor b/library/ui/gadgets.factor
index 406695d35d9144ae61d640b41ac9453293b7cd8d..a67175f1053542d56dd0b68afb5c2663e68d60a6 100644 (file)
--- a/library/ui/gadgets.factor
+++ b/library/ui/gadgets.factor
@@ -60,27 +60,14 @@ DEFER: add-invalid
         [ gadget-parent [ relayout ] when* ] ifte
     ] ifte ;
 
-: (relayout-down)
-    dup invalidate gadget-children [ (relayout-down) ] each ;
-
 : relayout-down ( gadget -- )
     #! Relayout a gadget and its children.
-    dup add-invalid (relayout-down) ;
+    dup add-invalid invalidate ;
 
 : set-gadget-dim ( dim gadget -- )
     2dup rect-dim =
     [ 2drop ] [ [ set-rect-dim ] keep relayout-down ] ifte ;
 
-GENERIC: pref-dim ( gadget -- dim )
-
-M: gadget pref-dim rect-dim ;
-
-GENERIC: layout* ( gadget -- )
-
-: prefer ( gadget -- ) dup pref-dim swap set-gadget-dim ;
-
-M: gadget layout* drop ;
-
 GENERIC: user-input* ( ch gadget -- ? )
 
 M: gadget user-input* 2drop t ;

diff --git a/library/ui/layouts.factor b/library/ui/layouts.factor
index 596e81c648b17d4ba55393e9a24c9609cd4cf6dd..f1ac6bb797cbda94e5cb032e0638bc0eb6613531 100644 (file)
--- a/library/ui/layouts.factor
+++ b/library/ui/layouts.factor
@@ -4,6 +4,16 @@ IN: gadgets-layouts
 USING: errors gadgets generic hashtables kernel lists math
 matrices namespaces sdl sequences ;
 
+GENERIC: pref-dim ( gadget -- dim )
+
+M: gadget pref-dim rect-dim ;
+
+GENERIC: layout* ( gadget -- )
+
+M: gadget layout* drop ;
+
+: prefer ( gadget -- ) dup pref-dim swap set-gadget-dim ;
+
 : layout ( gadget -- )
     #! Set the gadget's width and height to its preferred width
     #! and height. The gadget's children are laid out first.