incremental layout fixes

diff --git a/library/ui/incremental.factor b/library/ui/incremental.factor
index f92ee39bd27090f186b975fcd2707773227c962d..edf541ffc2ba868de76d2e0da92a28860a5acc55 100644 (file)
--- a/library/ui/incremental.factor
+++ b/library/ui/incremental.factor
@@ -32,7 +32,7 @@ M: incremental layout* drop ;
     [ next-cursor ] keep set-incremental-cursor ;
 
 : incremental-loc ( gadget incremental -- )
-    dup incremental-cursor dup rot pack-vector v* v-
+    dup incremental-cursor swap pack-vector v*
     swap set-shape-loc ;
 
 : prefer-incremental ( gadget -- )

diff --git a/library/ui/init-world.factor b/library/ui/init-world.factor
index 61177c2ff535ce98c9a30c88f35a7d8aa4e6fde4..275d4a273d0dc7a00bb5c7df530a29a63c0ea71f 100644 (file)
--- a/library/ui/init-world.factor
+++ b/library/ui/init-world.factor
@@ -23,11 +23,9 @@ global [
 
     <pane> dup
     
-    <scroller> "Stack display goes here" <label> <y-splitter>
-    3/4 over set-splitter-split add-layer
+    <scroller> "Stack display goes here" <label> 3/4 <y-splitter> add-layer
     
-    dup
-    [ [ clear  print-banner listener ] in-thread ] with-stream
+    dup [ [ clear  print-banner listener ] in-thread ] with-stream
     
     request-focus
 ] bind

diff --git a/library/ui/splitters.factor b/library/ui/splitters.factor
index 895cc8840ad6849a419ac4a0394ed9e01f4e57e7..cf61f4f93cff04551a28105520d88d2abc4bef73 100644 (file)
--- a/library/ui/splitters.factor
+++ b/library/ui/splitters.factor
@@ -30,17 +30,19 @@ C: divider ( -- divider )
     dup t reverse-video set-paint-prop
     dup divider-actions ;
 
-C: splitter ( first second vector -- splitter )
+C: splitter ( first second split vector -- splitter )
     [ >r 0 1 rot <pack> r> set-delegate ] keep
+    [ set-splitter-split ] keep
     swapd
     [ add-gadget ] keep
     <divider> over add-gadget
-    [ add-gadget ] keep
-    1/2 over set-splitter-split ;
+    [ add-gadget ] keep ;
 
-: <x-splitter> { 0 1 0 } <splitter> ;
+: <x-splitter> ( first second split -- splitter )
+    { 0 1 0 } <splitter> ;
 
-: <y-splitter> { 1 0 0 } <splitter> ;
+: <y-splitter> ( first second split -- splitter )
+    { 1 0 0 } <splitter> ;
 
 : splitter-part ( splitter -- vec )
     dup splitter-split swap shape-dim n*v divider-size 1/2 v*n v- ;