steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui no longer depends on *.lib

db4
Slava Pestov 2008-04-05 07:57:51 -05:00
parent b886718609
commit f94596af57
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extra/ui/gestures/gestures.factor
View File

@ -2,9 +2,8 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: arrays assocs kernel math models namespaces USING: arrays assocs kernel math models namespaces
sequences words strings system hashtables math.parser sequences words strings system hashtables math.parser
math.vectors classes.tuple classes ui.gadgets combinators.lib math.vectors classes.tuple classes ui.gadgets boxes
boxes calendar alarms symbols combinators ;
calendar alarms symbols ;
IN: ui.gestures IN: ui.gestures
: set-gestures ( class hash -- ) "gestures" set-word-prop ; : set-gestures ( class hash -- ) "gestures" set-word-prop ;
@ -188,11 +187,12 @@ SYMBOL: drag-timer
: multi-click? ( button -- ? ) : multi-click? ( button -- ? )
{ {
[ multi-click-timeout? ] { [ multi-click-timeout? not ] [ f ] }
[ multi-click-button? ] { [ multi-click-button? not ] [ f ] }
[ multi-click-position? ] { [ multi-click-position? not ] [ f ] }
[ multi-click-position? ] { [ multi-click-position? not ] [ f ] }
} && nip ; { [ t ] [ t ] }
} cond nip ;
: update-click# ( button -- ) : update-click# ( button -- )
global [ global [

5
extra/ui/tools/interactor/interactor.factor
View File

@ -3,7 +3,7 @@
USING: arrays assocs combinators continuations documents USING: arrays assocs combinators continuations documents
hashtables io io.styles kernel math hashtables io io.styles kernel math
math.vectors models namespaces parser prettyprint quotations math.vectors models namespaces parser prettyprint quotations
sequences sequences.lib strings threads listener sequences strings threads listener
classes.tuple ui.commands ui.gadgets ui.gadgets.editors classes.tuple ui.commands ui.gadgets ui.gadgets.editors
ui.gadgets.presentations ui.gadgets.worlds ui.gestures ui.gadgets.presentations ui.gadgets.worlds ui.gestures
definitions boxes calendar concurrency.flags ui.tools.workspace definitions boxes calendar concurrency.flags ui.tools.workspace
@ -105,7 +105,8 @@ M: interactor model-changed
] curry "input" suspend ; ] curry "input" suspend ;
M: interactor stream-readln M: interactor stream-readln
[ interactor-yield ] keep interactor-finish ?first ; [ interactor-yield ] keep interactor-finish
dup [ first ] when ;
: interactor-call ( quot interactor -- ) : interactor-call ( quot interactor -- )
dup interactor-busy? [ dup interactor-busy? [