From ec95a0db6326c2d0502f575d71f8b50321a6e608 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 30 Sep 2008 23:38:11 -0500 Subject: [PATCH] Fix erg's mouse drag bug --- basis/ui/gadgets/worlds/worlds.factor | 8 ++++---- basis/ui/gestures/gestures.factor | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/basis/ui/gadgets/worlds/worlds.factor b/basis/ui/gadgets/worlds/worlds.factor index 1bdc63ed0e..6f901c37ee 100755 --- a/basis/ui/gadgets/worlds/worlds.factor +++ b/basis/ui/gadgets/worlds/worlds.factor @@ -101,10 +101,10 @@ world H{ { T{ key-down f { C+ } "c" } [ T{ copy-action } send-action ] } { T{ key-down f { C+ } "v" } [ T{ paste-action } send-action ] } { T{ key-down f { C+ } "a" } [ T{ select-all-action } send-action ] } - { T{ button-down f { C+ } 1 } [ T{ button-down f f 3 } swap resend-button-down ] } - { T{ button-down f { A+ } 1 } [ T{ button-down f f 2 } swap resend-button-down ] } - { T{ button-up f { C+ } 1 } [ T{ button-up f f 3 } swap resend-button-up ] } - { T{ button-up f { A+ } 1 } [ T{ button-up f f 2 } swap resend-button-up ] } + { T{ button-down f { C+ } 1 } [ drop T{ button-down f f 3 } button-gesture ] } + { T{ button-down f { A+ } 1 } [ drop T{ button-down f f 2 } button-gesture ] } + { T{ button-up f { C+ } 1 } [ drop T{ button-up f f 3 } button-gesture ] } + { T{ button-up f { A+ } 1 } [ drop T{ button-up f f 2 } button-gesture ] } } set-gestures : close-global ( world global -- ) diff --git a/basis/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor index a1c6adac6e..2a29d32055 100755 --- a/basis/ui/gestures/gestures.factor +++ b/basis/ui/gestures/gestures.factor @@ -249,12 +249,6 @@ SYMBOL: drag-timer : send-action ( world gesture -- ) swap world-focus send-gesture drop ; -: resend-button-down ( gesture world -- ) - hand-loc get-global swap send-button-down ; - -: resend-button-up ( gesture world -- ) - hand-loc get-global swap send-button-up ; - GENERIC: gesture>string ( gesture -- string/f ) : modifiers>string ( modifiers -- string )