diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-03-03 03:27:01 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-03-03 03:27:01 +0000 |
| commit | b406ea71902311a19a4b26665259bce08ae98140 (patch) | |
| tree | 1a9ef0c95293e38a2830c486a57413dacda6f5fe /src/event-context.cpp | |
| parent | mess with naming a little bit and quiet compiler warnings about unhandled (diff) | |
| download | inkscape-b406ea71902311a19a4b26665259bce08ae98140.tar.gz inkscape-b406ea71902311a19a4b26665259bce08ae98140.zip | |
decouple click and drag release handlers to fix bug where zooming in by middle button sometimes caused unwanted scrolling
(bzr r2511)
Diffstat (limited to 'src/event-context.cpp')
| -rw-r--r-- | src/event-context.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/event-context.cpp b/src/event-context.cpp index 99dc5ac20..0cf4f8924 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -434,15 +434,19 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, xp = yp = 0; if (within_tolerance && (panning || zoom_rb)) { zoom_rb = 0; + if (panning) { + panning = 0; + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), + event->button.time); + } NR::Point const event_w(event->button.x, event->button.y); NR::Point const event_dt(desktop->w2d(event_w)); desktop->zoom_relative_keep_point(event_dt, (event->button.state & GDK_SHIFT_MASK) ? 1/zoom_inc : zoom_inc); desktop->updateNow(); - } - if (panning == event->button.button) { - panning = 0; ret = TRUE; + } else if (panning == event->button.button) { + panning = 0; sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); @@ -453,8 +457,8 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, NR::Point const motion_w(event->button.x, event->button.y); NR::Point const moved_w( motion_w - button_w ); event_context->desktop->scroll_world(moved_w); - desktop->updateNow(); + ret = TRUE; } else if (zoom_rb == event->button.button) { zoom_rb = 0; NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle(); @@ -462,6 +466,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, if (b != NR::Nothing() && !within_tolerance) { desktop->set_display_area(b.assume(), 10); } + ret = TRUE; } break; case GDK_KEY_PRESS: |