diff options
| author | dgp@users.sourceforge.net <dgp> | 2008-04-17 14:48:21 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2008-04-17 14:48:21 (GMT) |
| commit | ab7a790fcec9957678a1ce44c614ecb4d52d61b7 (patch) | |
| tree | fa544f2f96397853a3db1525b7b051b3bb340e12 /generic/tkCanvas.c | |
| parent | aa6f5dab19e3c6898d5228867ddfd5c15f1ef98d (diff) | |
| download | tk-ab7a790fcec9957678a1ce44c614ecb4d52d61b7.zip tk-ab7a790fcec9957678a1ce44c614ecb4d52d61b7.tar.gz tk-ab7a790fcec9957678a1ce44c614ecb4d52d61b7.tar.bz2 | |
* generic/tkCanvas.c: Fix logic that determines when canvas item
<Enter> event should fire. Thanks to Sebastian Wangnick. [Bug 1327482]
Diffstat (limited to 'generic/tkCanvas.c')
| -rw-r--r-- | generic/tkCanvas.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 9d4dd05..79630db 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvas.c,v 1.21.2.4 2007/04/29 02:24:01 das Exp $ + * RCS: @(#) $Id: tkCanvas.c,v 1.21.2.5 2008/04/17 14:48:23 dgp Exp $ */ /* #define USE_OLD_TAG_SEARCH 1 */ @@ -4663,9 +4663,6 @@ PickCurrentItem(canvasPtr, eventPtr) buttonDown = canvasPtr->state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask); - if (!buttonDown) { - canvasPtr->flags &= ~LEFT_GRABBED_ITEM; - } /* * Save information about this event in the canvas. The event in @@ -4739,6 +4736,10 @@ PickCurrentItem(canvasPtr, eventPtr) return; } + if (!buttonDown) { + canvasPtr->flags &= ~LEFT_GRABBED_ITEM; + } + /* * Simulate a LeaveNotify event on the previous current item and * an EnterNotify event on the new current item. Remove the "current" |