From e8c60ca890b1ce43ad9b8a24716c14b37f582cdd Mon Sep 17 00:00:00 2001
From: nicolas-p <z.nicolas@gmail.com>
Date: Sat, 23 Apr 2016 10:47:52 +0200
Subject: [PATCH] Made scrollers disappear when disabled

---
 basis/ui/gadgets/scrollers/scrollers.factor | 14 ++++++++------
 basis/ui/gadgets/sliders/sliders.factor     |  6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/basis/ui/gadgets/scrollers/scrollers.factor b/basis/ui/gadgets/scrollers/scrollers.factor
index 21f51db9e3..1919050af9 100644
--- a/basis/ui/gadgets/scrollers/scrollers.factor
+++ b/basis/ui/gadgets/scrollers/scrollers.factor
@@ -3,8 +3,8 @@
 USING: accessors arrays combinators combinators.short-circuit
 kernel math.rectangles math.vectors models models.product
 models.range namespaces sequences ui.gadgets ui.gadgets.frames
-ui.gadgets.grids ui.gadgets.sliders ui.gadgets.viewports
-ui.gestures ;
+ui.gadgets.grids ui.gadgets.private ui.gadgets.sliders
+ui.gadgets.viewports ui.gestures ;
 IN: ui.gadgets.scrollers
 
 TUPLE: scroller < frame column-header viewport x y follows ;
@@ -96,10 +96,12 @@ M: rect update-scroller swap (scroll>rect) ;
 M: f update-scroller drop (update-scroller) ;
 
 M: scroller layout*
-    [ call-next-method ] [
-        dup follows>>
-        [ update-scroller ] [ >>follows drop ] 2bi
-    ] bi ;
+    {
+      [ call-next-method ]
+      [ dup follows>> [ update-scroller ] [ >>follows drop ] 2bi ]
+      [ [ x>> ] [ y>> ] bi [ forget-pref-dim ] bi@ ]
+      [ call-next-method ]
+    } cleave ;
 
 M: scroller focusable-child*
     viewport>> ;
diff --git a/basis/ui/gadgets/sliders/sliders.factor b/basis/ui/gadgets/sliders/sliders.factor
index 1b9061e518..135ad39395 100644
--- a/basis/ui/gadgets/sliders/sliders.factor
+++ b/basis/ui/gadgets/sliders/sliders.factor
@@ -224,8 +224,9 @@ M: slider-pen pen-pref-dim
     enabled>> pen-pref-dim ;
 
 M: slider pref-dim*
-    [ dup interior>> pen-pref-dim ] [ drop { 100 100 } ] [ orientation>> ] tri
-    set-axis ;
+    [ slider-enabled? [ { 14 14 } ] [ { 0 0 } ] if ]
+    [ drop { 100 100 } ]
+    [ orientation>> ] tri set-axis ;
 
 PRIVATE>
 
@@ -234,7 +235,6 @@ PRIVATE>
         swap >>model
         16 >>line
         dup orientation>> {
-            [ <slider-pen> >>interior ]
             [ <thumb> >>thumb ]
             [ <elevator> >>elevator ]
             [ drop dup add-thumb-to-elevator 1 track-add ]