From 8d565b6968333c31bce6d3427a35848523759602 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 11 Feb 2005 17:45:24 +0000 Subject: [PATCH] basic notion of keyboard focus --- examples/gadget-test.factor | 21 +++++++++++++++------ fonts/Vera.ttf | Bin 0 -> 65932 bytes fonts/VeraBI.ttf | Bin 0 -> 63208 bytes fonts/VeraBd.ttf | Bin 0 -> 58716 bytes fonts/VeraIt.ttf | Bin 0 -> 63684 bytes fonts/VeraSe.ttf | Bin 0 -> 60280 bytes fonts/VeraSeBd.ttf | Bin 0 -> 58736 bytes library/bootstrap/boot-stage2.factor | 1 + library/sdl/sdl-utils.factor | 2 ++ library/ui/gadgets.factor | 10 +++++----- library/ui/gestures.factor | 2 +- library/ui/hand.factor | 4 ++-- library/ui/world.factor | 12 ++++++------ 13 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 fonts/Vera.ttf create mode 100644 fonts/VeraBI.ttf create mode 100644 fonts/VeraBd.ttf create mode 100644 fonts/VeraIt.ttf create mode 100644 fonts/VeraSe.ttf create mode 100644 fonts/VeraSeBd.ttf diff --git a/examples/gadget-test.factor b/examples/gadget-test.factor index 859a20e1a4..9b47faa4da 100644 --- a/examples/gadget-test.factor +++ b/examples/gadget-test.factor @@ -36,10 +36,20 @@ USE: stdio USE: prettyprint USE: words +: grab ( gadget hand -- ) + [ swap screen-pos swap screen-pos - >rect ] 2keep + >r [ move-gadget ] keep r> add-gadget ; + +: release ( gadget world -- ) + >r dup screen-pos >r + dup unparent + r> >rect pick move-gadget + r> add-gadget ; + : moving-actions {{ - [[ [ button-down 1 ] [ 0 0 pick move-gadget my-hand add-gadget ] ]] - [[ [ button-up 1 ] [ my-hand shape-x my-hand shape-y pick move-gadget world get add-gadget ] ]] + [[ [ button-down 1 ] [ my-hand grab ] ]] + [[ [ button-up 1 ] [ world get release ] ]] }} swap set-gadget-gestures ; : filled? "filled" get checkbox-selected? ; @@ -65,12 +75,11 @@ USE: words "Filled?" dup "filled" set "shelf" get add-gadget "shelf" get "pile" get add-gadget "Welcome to Factor " version cat2