ardour/livetrax
13
0
Fork 0
Code

when delivering enter/leave events to canvas items, ensure that the event coordinates are in canvas space, not window space

Browse Source 
This fixes a variety of borkage in the canvas at present
This commit is contained in:
Paul Davis 2014-06-08 11:24:28 -04:00
parent 153befa92c
commit 5e281d3b44
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/canvas/canvas.cc
View File

@ -335,6 +335,10 @@ GtkCanvas::pick_current_item (int state)
pick_current_item (Duple (x, y), state); pick_current_item (Duple (x, y), state);
} }
/** Given @param point (a position in window coordinates)
* and mouse state @param state, check to see if _current_item
* (which will be used to deliver events) should change.
*/
void void
GtkCanvas::pick_current_item (Duple const & point, int state) GtkCanvas::pick_current_item (Duple const & point, int state)
{ {
@ -344,7 +348,7 @@ GtkCanvas::pick_current_item (Duple const & point, int state)
return; return;
} }
/* find the items at the given position */ /* find the items at the given window position */
vector<Item const *> items; vector<Item const *> items;
_root.add_items_at_point (point, items); _root.add_items_at_point (point, items);
@ -421,8 +425,14 @@ GtkCanvas::deliver_enter_leave (Duple const & point, int state)
enter_event.mode = GDK_CROSSING_NORMAL; enter_event.mode = GDK_CROSSING_NORMAL;
enter_event.focus = FALSE; enter_event.focus = FALSE;
enter_event.state = state; enter_event.state = state;
enter_event.x = point.x;
enter_event.y = point.y; /* Events delivered to canvas items are expected to be in canvas
* coordinates but @param point is in window coordinates.
*/
Duple c = window_to_canvas (point);
enter_event.x = c.x;
enter_event.y = c.y;
GdkEventCrossing leave_event = enter_event; GdkEventCrossing leave_event = enter_event;
leave_event.type = GDK_LEAVE_NOTIFY; leave_event.type = GDK_LEAVE_NOTIFY;
@ -738,7 +748,7 @@ GtkCanvas::on_motion_notify_event (GdkEventMotion* ev)
/* Coordinates in "copy" will be canvas coordinates, /* Coordinates in "copy" will be canvas coordinates,
*/ */
// DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas motion @ %1, %2\n", ev->x, ev->y)); DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas motion @ %1, %2 canvas @ %3, %4\n", ev->x, ev->y, copy.motion.x, copy.motion.y));
pick_current_item (point, ev->state); pick_current_item (point, ev->state);