]> gitweb.factorcode.org Git - factor.git/commitdiff
ui.tools.listener: handle history-completion popup differently.
authorJohn Benediktsson <mrjbq7@gmail.com>
Wed, 6 Nov 2019 20:16:19 +0000 (12:16 -0800)
committerJohn Benediktsson <mrjbq7@gmail.com>
Wed, 6 Nov 2019 20:16:19 +0000 (12:16 -0800)
basis/ui/tools/listener/completion/completion.factor
basis/ui/tools/listener/listener.factor

index 82e5b16f18e2535150c2fd1b884844f8a7fa082c..e0a5605360a5717b66acbbaaf9ca4b6bccb293f7 100644 (file)
@@ -196,3 +196,13 @@ M: completion-popup handle-gesture ( gesture completion -- ? )
     2dup completion-gesture [
         [ nip hide-glass ] [ invoke-command ] 2bi* f
     ] [ drop call-next-method ] if* ;
+
+: ?check-popup ( interactor -- interactor )
+    dup popup>> [
+        gadget-child dup completion-popup? [
+            completion-mode>> dup history-completion? [ drop ] [
+                over completion-mode =
+                [ dup popup>> hide-glass ] unless
+            ] if
+        ] [ drop ] if
+    ] when* ;
index c5d637b39c5d3771f8cec2862a61542379e42de7..aa56bb4cdcb3b557c5ffd85fc679d2d350da038e 100644 (file)
@@ -373,14 +373,6 @@ M: interactor stream-read-quot ( stream -- quot/f )
     [ nip ] [ gesture>operation ] 2bi
     [ invoke-command f ] [ drop t ] if* ;
 
-: ?check-popup ( interactor -- interactor )
-    dup popup>> [
-        gadget-child dup completion-popup? [
-            completion-mode>> over completion-mode =
-            [ dup popup>> hide-glass ] unless
-        ] [ drop ] if
-    ] when* ;
-
 M: interactor handle-gesture
     {
         { [ over key-gesture? not ] [ call-next-method ] }