ui.gadgets.sliders: Rewrite 'slider-scale' to not use shuffle words

diff --git a/basis/ui/gadgets/sliders/sliders.factor b/basis/ui/gadgets/sliders/sliders.factor
index 9e13e5ad7cb14378d932c9dcd7897ae60bf88952..1c2055156ea346020159fb51e1d0ea1ab21aa0f5 100644 (file)
--- a/basis/ui/gadgets/sliders/sliders.factor
+++ b/basis/ui/gadgets/sliders/sliders.factor
@@ -36,8 +36,9 @@ TUPLE: slider < frame elevator thumb saved line ;
     #! A scaling factor such that if x is a slider co-ordinate,
     #! x*n is the screen position of the thumb, and conversely
     #! for x/n. The '1 max' calls avoid division by zero.
-    dup elevator-length over thumb-dim - 1 max
-    swap slider-max* 1 max / ;
+    [ [ elevator-length ] [ thumb-dim ] bi - 1 max ]
+    [ slider-max* 1 max ]
+    bi / ;
 
 : slider>screen ( m scale -- n ) slider-scale * ;
 : screen>slider ( m scale -- n ) slider-scale / ;