Revert "ui.gadgets: refactor scroll-at-bottom?."

This reverts commit ef06b2c54854b1e7d3143dcc10cc4d13dfa2635b.

diff --git a/basis/ui/gadgets/panes/panes.factor b/basis/ui/gadgets/panes/panes.factor
index 14dad8e281cc431b4663160a414274a8be3d7c7b..8f92ecd02afc84bdc76423c94ad6d7d12d6b1741 100644 (file)
--- a/basis/ui/gadgets/panes/panes.factor
+++ b/basis/ui/gadgets/panes/panes.factor
@@ -121,7 +121,11 @@ GENERIC: pane-line ( str style gadget -- )
     [ 1string H{ } ] dip current>> pane-line ;
 
 : pane-scrolls? ( pane -- ? )
-    dup scrolls?>> [ find-scroller scroll-at-bottom? ] [ drop f ] if ;
+    dup scrolls?>> [
+        find-scroller control-value [
+            second first4 nip [ + ] [ >= ] bi*
+        ] [ f ] if*
+    ] [ drop f ] if ;
 
 : do-pane-stream ( pane-stream quot -- )
     [ pane>> ] dip dup pane-scrolls? [ keep ] dip

diff --git a/basis/ui/gadgets/scrollers/scrollers.factor b/basis/ui/gadgets/scrollers/scrollers.factor
index d989c6f056cc2bcf457e517d0e4b01cf7561988a..9b9ae8c690cdf094880d22ad9e1fc4bbadb8b532 100644 (file)
--- a/basis/ui/gadgets/scrollers/scrollers.factor
+++ b/basis/ui/gadgets/scrollers/scrollers.factor
@@ -36,11 +36,6 @@ M: gadget viewport-column-header drop f ;
     ] keep
     2dup control-value = [ 2drop ] [ set-control-value ] if ;
 
-: scroll-at-bottom? ( scroller -- ? )
-    control-value [
-        second first4 nip [ + ] [ >= ] bi*
-    ] [ f ] if* ;
-
 <PRIVATE
 
 : do-mouse-scroll ( scroller -- )