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/node-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/node-context.cpp')
| -rw-r--r-- | src/node-context.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/node-context.cpp b/src/node-context.cpp index b205b86d5..9f026c3f2 100644 --- a/src/node-context.cpp +++ b/src/node-context.cpp @@ -296,7 +296,7 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) NR::Point const button_w(event->button.x, event->button.y); NR::Point const button_dt(desktop->w2d(button_w)); - Inkscape::Rubberband::get()->start(desktop, button_dt); + Inkscape::Rubberband::get(desktop)->start(desktop, button_dt); nc->current_state = SP_NODE_CONTEXT_INACTIVE; desktop->updateNow(); ret = TRUE; @@ -343,11 +343,11 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; } case SP_NODE_CONTEXT_RUBBERBAND_DRAGGING: - if (Inkscape::Rubberband::get()->is_started()) { + if (Inkscape::Rubberband::get(desktop)->is_started()) { NR::Point const motion_w(event->motion.x, event->motion.y); NR::Point const motion_dt(desktop->w2d(motion_w)); - Inkscape::Rubberband::get()->move(motion_dt); + Inkscape::Rubberband::get(desktop)->move(motion_dt); } break; } @@ -429,7 +429,7 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) selection->set(item_clicked); desktop->updateNow(); } - Inkscape::Rubberband::get()->stop(); + Inkscape::Rubberband::get(desktop)->stop(); ret = TRUE; break; } @@ -437,7 +437,7 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (event->type == GDK_BUTTON_RELEASE) { event_context->xp = event_context->yp = 0; if (event->button.button == 1) { - boost::optional<NR::Rect> b = Inkscape::Rubberband::get()->getRectangle(); + boost::optional<NR::Rect> b = Inkscape::Rubberband::get(desktop)->getRectangle(); if (nc->shape_editor->hits_curve() && !event_context->within_tolerance) { //drag curve nc->shape_editor->finish_drag(); @@ -452,7 +452,7 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) } } ret = TRUE; - Inkscape::Rubberband::get()->stop(); + Inkscape::Rubberband::get(desktop)->stop(); desktop->updateNow(); nc->rb_escaped = false; nc->drag = FALSE; @@ -620,9 +620,9 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) break; case GDK_Escape: { - boost::optional<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle(); + boost::optional<NR::Rect> const b = Inkscape::Rubberband::get(desktop)->getRectangle(); if (b) { - Inkscape::Rubberband::get()->stop(); + Inkscape::Rubberband::get(desktop)->stop(); nc->current_state = SP_NODE_CONTEXT_INACTIVE; nc->rb_escaped = true; } else { |