From 2912dad939189af4b19ac09b9179b9439a1694c2 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 25 Jan 2022 14:09:08 -0800 Subject: [PATCH] ui.tools.button-list: not sure why this commit was missed --- basis/ui/gadgets/buttons/buttons.factor | 5 ++++- basis/ui/tools/button-list/button-list.factor | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor index c7609dbe06..11889b9a5c 100644 --- a/basis/ui/gadgets/buttons/buttons.factor +++ b/basis/ui/gadgets/buttons/buttons.factor @@ -40,11 +40,14 @@ PRIVATE> : button-leave ( button -- ) [ hide-status ] [ button-update ] bi ; +: button-invoke ( button -- ) + dup quot>> call( button -- ) ; + : button-clicked ( button -- ) [ ] [ button-update ] [ button-rollover? ] tri - [ dup quot>> call( button -- ) ] [ drop ] if ; + [ button-invoke ] [ drop ] if ; button H{ { T{ button-up } [ button-clicked ] } diff --git a/basis/ui/tools/button-list/button-list.factor b/basis/ui/tools/button-list/button-list.factor index 87678d758e..fb99e0c4a6 100644 --- a/basis/ui/tools/button-list/button-list.factor +++ b/basis/ui/tools/button-list/button-list.factor @@ -39,7 +39,10 @@ M: clickable ungraft* : ( model -- table ) [ keys [ ">" swap 2array ] map ] trivial-renderer [ second ] dup table>> - [ second world-buttons at invoke-primary ] >>action + [ + second world-buttons at dup presentation? + [ invoke-primary ] [ button-invoke ] if + ] >>action [ hide-glass ] >>hook t >>selection-required? 10 >>min-rows -- 2.34.1