From: John Benediktsson <mrjbq7@gmail.com>
Date: Tue, 25 Jan 2022 19:28:13 +0000 (-0800)
Subject: ui: fix bootstrap for show-active-buttons-popup
X-Git-Tag: 0.99~1648
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=de1da77d62cad2ebf94b714ffca460634a205800

ui: fix bootstrap for show-active-buttons-popup
---

diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index 461ee21b5c..65d567afee 100644
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -217,7 +217,6 @@ browser-gadget "navigation" "Commands for navigating in the article hierarchy" {
     { T{ key-down f ${ os macosx? M+ A+ ? } "k" } com-show-outgoing-links }
     { T{ key-down f ${ os macosx? M+ A+ ? } "K" } com-show-incoming-links }
     { T{ key-down f ${ os macosx? M+ A+ ? } "f" } browser-focus-search }
-    { T{ key-down f ${ os macosx? C+ A+ ? } "t" } com-show-active-buttons }
 } os macosx? [ {
     { T{ key-down f { M+ } "[" } com-back }
     { T{ key-down f { M+ } "]" } com-forward }
diff --git a/basis/ui/tools/button-list/button-list.factor b/basis/ui/tools/button-list/button-list.factor
index bbf68cb274..b0029e5b74 100644
--- a/basis/ui/tools/button-list/button-list.factor
+++ b/basis/ui/tools/button-list/button-list.factor
@@ -53,4 +53,3 @@ button-list-popup H{
 : show-active-buttons-popup ( tool -- )
     active-buttons get <model> "Active Buttons" <active-buttons-popup>
     [ hand-loc get-global point>rect show-glass ] [ request-focus ] bi ; inline
-
diff --git a/basis/ui/tools/common/common-docs.factor b/basis/ui/tools/common/common-docs.factor
index 9bd62e0281..3128e81de7 100644
--- a/basis/ui/tools/common/common-docs.factor
+++ b/basis/ui/tools/common/common-docs.factor
@@ -8,6 +8,3 @@ HELP: set-tool-dim
 HELP: with-lines
 { $values { "track" gadget } }
 { $description "Lines are added to the track gadget to visually demarcate its children." } ;
-
-HELP: com-show-active-buttons
-{ $description "Mapped to a keyboard gesture to execute " { $link show-active-buttons-popup } "." } ;
diff --git a/basis/ui/tools/common/common.factor b/basis/ui/tools/common/common.factor
index 398e154f03..50f147889c 100644
--- a/basis/ui/tools/common/common.factor
+++ b/basis/ui/tools/common/common.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors classes combinators.short-circuit kernel ui
 ui.gadgets ui.gadgets.borders ui.gadgets.scrollers
-ui.gadgets.tracks ui.pens.solid ui.theme ui.tools.button-list words ;
+ui.gadgets.tracks ui.pens.solid ui.theme words ;
 
 IN: ui.tools.common
 
@@ -48,6 +48,3 @@ SLOT: scroller
 
 : white-interior ( track -- track )
     content-background <solid> >>interior ;
-
-: com-show-active-buttons ( tool -- )
-    show-active-buttons-popup ;
diff --git a/basis/ui/tools/tools.factor b/basis/ui/tools/tools.factor
index 8a69436074..b4c21800d5 100644
--- a/basis/ui/tools/tools.factor
+++ b/basis/ui/tools/tools.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel literals memory namespaces sequences system
 tools.test ui ui.backend ui.commands ui.gestures ui.tools.browser
-ui.tools.common ui.tools.error-list ui.tools.listener
-vocabs.refresh ;
+ui.tools.button-list ui.tools.common ui.tools.error-list
+ui.tools.listener vocabs.refresh ;
 IN: ui.tools
 
 \ refresh-all H{ { +nullary+ t } { +listener+ t } } define-command
@@ -23,7 +23,7 @@ tool "tool-switching" f {
 } define-command-map
 
 tool "common" f {
-    { T{ key-down f ${ os macosx? M+ A+ ? } "t" } com-show-active-buttons }
+    { T{ key-down f ${ os macosx? M+ A+ ? } "t" } show-active-buttons-popup }
     { T{ key-down f ${ os macosx? M+ C+ ? } "w" } close-window }
     { T{ key-down f ${ os macosx? M+ C+ ? } "q" } com-exit }
     { T{ key-down f f "F2" } refresh-all }