diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-08-14 21:35:32 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-08-14 21:35:32 +0000 |
| commit | 8e0ceb0c448765b151744838e67e9e2bcdaa0ba3 (patch) | |
| tree | ff380858187aad25d049ac97f682b97f9f4447c0 /src/event-context.cpp | |
| parent | Get rid of a whole bunch of further instances of SP_ACTIVE_DESKTOP (where the... (diff) | |
| download | inkscape-8e0ceb0c448765b151744838e67e9e2bcdaa0ba3.tar.gz inkscape-8e0ceb0c448765b151744838e67e9e2bcdaa0ba3.zip | |
Removal of SP_ACTIVE_DESKTOP, next take
(bzr r6630)
Diffstat (limited to 'src/event-context.cpp')
| -rw-r--r-- | src/event-context.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/event-context.cpp b/src/event-context.cpp index 22c91e450..450d1994d 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -457,10 +457,10 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, // motion notify coordinates as given (no snapping back to origin) within_tolerance = false; - if (Inkscape::Rubberband::get()->is_started()) { - Inkscape::Rubberband::get()->move(motion_dt); + if (Inkscape::Rubberband::get(desktop)->is_started()) { + Inkscape::Rubberband::get(desktop)->move(motion_dt); } else { - Inkscape::Rubberband::get()->start(desktop, motion_dt); + Inkscape::Rubberband::get(desktop)->start(desktop, motion_dt); } if (zoom_rb == 2) gobble_motion_events(GDK_BUTTON2_MASK); @@ -497,8 +497,8 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, ret = TRUE; } else if (zoom_rb == event->button.button) { zoom_rb = 0; - boost::optional<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle(); - Inkscape::Rubberband::get()->stop(); + boost::optional<NR::Rect> const b = Inkscape::Rubberband::get(desktop)->getRectangle(); + Inkscape::Rubberband::get(desktop)->stop(); if (b && !within_tolerance) { desktop->set_display_area(*b, 10); } |