summaryrefslogtreecommitdiffstats
path: root/src/node-context.cpp
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-08-13 15:06:50 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-08-13 15:06:50 +0000
commit403fcb28260c3991bc01ff5b146adb0ace3947e5 (patch)
tree33f2e5589772b90aa6aacc744a98fb568ff72a7e /src/node-context.cpp
parentInitialize the pointer variables in draw-context with NULL, just to be on the... (diff)
downloadinkscape-403fcb28260c3991bc01ff5b146adb0ace3947e5.tar.gz
inkscape-403fcb28260c3991bc01ff5b146adb0ace3947e5.zip
Get rid of sp_nodepath_current() and a few instances of SP_ACTIVE_DESKTOP by passing in the current desktop and nodepath from the caller
(bzr r6615)
Diffstat (limited to 'src/node-context.cpp')
-rw-r--r--src/node-context.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/node-context.cpp b/src/node-context.cpp
index d8a1ec1d7..96b562a3f 100644
--- a/src/node-context.cpp
+++ b/src/node-context.cpp
@@ -557,8 +557,8 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
if (MOD__ALT) { // alt
- if (MOD__SHIFT) nc->shape_editor->move_nodes_screen(mul*-10, 0); // shift
- else nc->shape_editor->move_nodes_screen(mul*-1, 0); // no shift
+ if (MOD__SHIFT) nc->shape_editor->move_nodes_screen(desktop, mul*-10, 0); // shift
+ else nc->shape_editor->move_nodes_screen(desktop, mul*-1, 0); // no shift
}
else { // no alt
if (MOD__SHIFT) nc->shape_editor->move_nodes(mul*-10*nudge, 0); // shift
@@ -574,8 +574,8 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
if (MOD__ALT) { // alt
- if (MOD__SHIFT) nc->shape_editor->move_nodes_screen(0, mul*10); // shift
- else nc->shape_editor->move_nodes_screen(0, mul*1); // no shift
+ if (MOD__SHIFT) nc->shape_editor->move_nodes_screen(desktop, 0, mul*10); // shift
+ else nc->shape_editor->move_nodes_screen(desktop, 0, mul*1); // no shift
}
else { // no alt
if (MOD__SHIFT) nc->shape_editor->move_nodes(0, mul*10*nudge); // shift
@@ -591,8 +591,8 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
if (MOD__ALT) { // alt
- if (MOD__SHIFT) nc->shape_editor->move_nodes_screen(mul*10, 0); // shift
- else nc->shape_editor->move_nodes_screen(mul*1, 0); // no shift
+ if (MOD__SHIFT) nc->shape_editor->move_nodes_screen(desktop, mul*10, 0); // shift
+ else nc->shape_editor->move_nodes_screen(desktop, mul*1, 0); // no shift
}
else { // no alt
if (MOD__SHIFT) nc->shape_editor->move_nodes(mul*10*nudge, 0); // shift
@@ -608,8 +608,8 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event)
gint mul = 1 + gobble_key_events(
get_group0_keyval(&event->key), 0); // with any mask
if (MOD__ALT) { // alt
- if (MOD__SHIFT) nc->shape_editor->move_nodes_screen(0, mul*-10); // shift
- else nc->shape_editor->move_nodes_screen(0, mul*-1); // no shift
+ if (MOD__SHIFT) nc->shape_editor->move_nodes_screen(desktop, 0, mul*-10); // shift
+ else nc->shape_editor->move_nodes_screen(desktop, 0, mul*-1); // no shift
}
else { // no alt
if (MOD__SHIFT) nc->shape_editor->move_nodes(0, mul*-10*nudge); // shift