From 4f09d852f312096875f4b7c9157188768dfc3799 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Mon, 27 Jul 2015 08:41:01 -0700 Subject: [PATCH] ui.gadgets.sliders: rename slider-pen-tuple to slider-pen. --- basis/ui/gadgets/sliders/sliders.factor | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/basis/ui/gadgets/sliders/sliders.factor b/basis/ui/gadgets/sliders/sliders.factor index 19b8a43885..0234c1ecca 100644 --- a/basis/ui/gadgets/sliders/sliders.factor +++ b/basis/ui/gadgets/sliders/sliders.factor @@ -192,7 +192,7 @@ M: slide-button pref-dim* dup interior>> pen-pref-dim ; "vertical-scroller-downarrow-clicked" ; -TUPLE: slider-pen-tuple enabled disabled ; +TUPLE: slider-pen enabled disabled ; : ( orientation -- pen ) { @@ -209,18 +209,18 @@ TUPLE: slider-pen-tuple enabled disabled ; "vertical-scroller-bottom-disabled" theme-image ] } } case - [ f f ] bi-curry@ 2bi \ slider-pen-tuple boa ; + [ f f ] bi-curry@ 2bi slider-pen boa ; -: slider-pen ( slider pen -- pen ) +: current-pen ( slider pen -- pen ) [ slider-enabled? ] [ [ enabled>> ] [ disabled>> ] bi ] bi* ? ; -M: slider-pen-tuple draw-interior - dupd slider-pen draw-interior ; +M: slider-pen draw-interior + dupd current-pen draw-interior ; -M: slider-pen-tuple draw-boundary - dupd slider-pen draw-boundary ; +M: slider-pen draw-boundary + dupd current-pen draw-boundary ; -M: slider-pen-tuple pen-pref-dim +M: slider-pen pen-pref-dim enabled>> pen-pref-dim ; M: slider pref-dim*