Moves button list into MIXIN instance

diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index 4ced17e86c29e3f597ef982227e8512b0393dd7b..c7609dbe06da538cee7120a2953cacf17679b1f5 100644 (file)
--- a/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -11,16 +11,6 @@ IN: ui.gadgets.buttons
 
 TUPLE: button < border pressed? selected? quot tooltip ;
 
-SYMBOL: active-buttons
-active-buttons [ H{ } ] initialize
-
-: label-from-button ( button -- str )
-    children>> [ label? ] find swap [ text>> ] [ drop "unknown" ] if ;
-
-M: button graft* dup label-from-button active-buttons get set-at ;
-
-M: button ungraft* label-from-button active-buttons get delete-at ;
-
 <PRIVATE
 
 : find-button ( gadget -- button )

diff --git a/basis/ui/tools/button-list/button-list-tests.factor b/basis/ui/tools/button-list/button-list-tests.factor
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/basis/ui/tools/button-list/button-list.factor b/basis/ui/tools/button-list/button-list.factor
index 07ad1a2ccca5a1fad6d8ce600db73061feec7c08..83a4733e2558408cfa974fb1ea5d6f03fe33dbc6 100644 (file)
--- a/basis/ui/tools/button-list/button-list.factor
+++ b/basis/ui/tools/button-list/button-list.factor
@@ -4,13 +4,32 @@ USING: accessors arrays assocs classes kernel math.rectangles
 models models.arrow namespaces sequences ui ui.gadgets
 ui.gadgets.buttons ui.gadgets.glass ui.gadgets.labeled 
 ui.gadgets.presentations ui.gadgets.search-tables
-ui.gadgets.tables ui.gadgets.wrappers ui.gestures ui.theme 
-ui.tools.browser.popups ui.tools.common ;
+ui.gadgets.labels ui.gadgets.tables ui.gadgets.wrappers ui.gestures
+ui.theme ui.tools.browser.popups ui.tools.common ;
 FROM: ui.gadgets.wrappers => wrapper ;
 IN: ui.tools.button-list
 
 TUPLE: button-list-popup < wrapper ;
 
+MIXIN: clickable
+
+SYMBOL: active-buttons
+active-buttons [ H{ } ] initialize
+
+: label-from-button ( button -- str/f )
+    children>> [ label? ] find swap [ text>> ] [ drop f ] if ;
+
+: store-labelled-button ( button -- str/f )
+    dup label-from-button [ [ active-buttons get set-at ] keep ] [ drop f ] if* ;
+
+: remove-labelled-button ( button -- str/f )
+    label-from-button [ dup active-buttons get delete-at ] [ f ] if* ;
+
+M: clickable graft* [ store-labelled-button drop ] [ call-next-method ] bi ;
+M: button ungraft* [ remove-labelled-button drop ] [ call-next-method ] bi ;
+
+INSTANCE: button clickable
+
 : <active-buttons-table> ( model -- table )
     [ keys [ ">" swap 2array ] map ] <arrow> trivial-renderer [ second ] <search-table> 
     dup table>>