all events propagate out of the canvas in canvas coordinates now, so revert changes in editor_drags.cc that worked around this not being the case

This commit is contained in:
Paul Davis 2013-10-31 16:43:35 -04:00
parent ba26316857
commit 85daa31ab5
3 changed files with 18 additions and 11 deletions

View file

@ -191,7 +191,7 @@ DragManager::window_motion_handler (GdkEvent* e, bool from_autoscroll)
{
bool r = false;
_current_pointer_frame = _editor->window_event_frame (e, &_current_pointer_x, &_current_pointer_y);
_current_pointer_frame = _editor->canvas_event_frame (e, &_current_pointer_x, &_current_pointer_y);
for (list<Drag*>::iterator i = _drags.begin(); i != _drags.end(); ++i) {
bool const t = (*i)->motion_handler (e, from_autoscroll);
@ -259,7 +259,7 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor)
_y_constrained = false;
}
_raw_grab_frame = _editor->window_event_frame (event, &_grab_x, &_grab_y);
_raw_grab_frame = _editor->canvas_event_frame (event, &_grab_x, &_grab_y);
setup_pointer_frame_offset ();
_grab_frame = adjusted_frame (_raw_grab_frame, event);
_last_pointer_frame = _grab_frame;