diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-07-05 15:46:24 +0000 |
|---|---|---|
| committer | Javiertxo <jtx@jtx.marker.es> | 2013-07-05 15:46:24 +0000 |
| commit | c0503c1a2b9a5f7a4030a664ca5a324ce38c967a (patch) | |
| tree | 9bc6d203a70155251a7a50210abe236cc2277d11 /src/select-context.cpp | |
| parent | Upadate to trunk (diff) | |
| parent | Merge: Command-line and DBus refactoring to improve inkscapes ability to be r... (diff) | |
| download | inkscape-c0503c1a2b9a5f7a4030a664ca5a324ce38c967a.tar.gz inkscape-c0503c1a2b9a5f7a4030a664ca5a324ce38c967a.zip | |
Update to trunk
(bzr r11950.1.123)
Diffstat (limited to 'src/select-context.cpp')
| -rw-r--r-- | src/select-context.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/select-context.cpp b/src/select-context.cpp index 1dd3b08d7..3df047368 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -921,12 +921,12 @@ sp_select_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(event)) { // alt - if (MOD__SHIFT(event)) sp_selection_move_screen(desktop, mul*-10, 0); // shift - else sp_selection_move_screen(desktop, mul*-1, 0); // no shift + if (MOD__SHIFT(event)) sp_selection_move_screen(sp_desktop_selection(desktop), mul*-10, 0); // shift + else sp_selection_move_screen(sp_desktop_selection(desktop), mul*-1, 0); // no shift } else { // no alt - if (MOD__SHIFT(event)) sp_selection_move(desktop, mul*-10*nudge, 0); // shift - else sp_selection_move(desktop, mul*-nudge, 0); // no shift + if (MOD__SHIFT(event)) sp_selection_move(sp_desktop_selection(desktop), mul*-10*nudge, 0); // shift + else sp_selection_move(sp_desktop_selection(desktop), mul*-nudge, 0); // no shift } ret = TRUE; } @@ -937,12 +937,12 @@ sp_select_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(event)) { // alt - if (MOD__SHIFT(event)) sp_selection_move_screen(desktop, 0, mul*10); // shift - else sp_selection_move_screen(desktop, 0, mul*1); // no shift + if (MOD__SHIFT(event)) sp_selection_move_screen(sp_desktop_selection(desktop), 0, mul*10); // shift + else sp_selection_move_screen(sp_desktop_selection(desktop), 0, mul*1); // no shift } else { // no alt - if (MOD__SHIFT(event)) sp_selection_move(desktop, 0, mul*10*nudge); // shift - else sp_selection_move(desktop, 0, mul*nudge); // no shift + if (MOD__SHIFT(event)) sp_selection_move(sp_desktop_selection(desktop), 0, mul*10*nudge); // shift + else sp_selection_move(sp_desktop_selection(desktop), 0, mul*nudge); // no shift } ret = TRUE; } @@ -953,12 +953,12 @@ sp_select_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(event)) { // alt - if (MOD__SHIFT(event)) sp_selection_move_screen(desktop, mul*10, 0); // shift - else sp_selection_move_screen(desktop, mul*1, 0); // no shift + if (MOD__SHIFT(event)) sp_selection_move_screen(sp_desktop_selection(desktop), mul*10, 0); // shift + else sp_selection_move_screen(sp_desktop_selection(desktop), mul*1, 0); // no shift } else { // no alt - if (MOD__SHIFT(event)) sp_selection_move(desktop, mul*10*nudge, 0); // shift - else sp_selection_move(desktop, mul*nudge, 0); // no shift + if (MOD__SHIFT(event)) sp_selection_move(sp_desktop_selection(desktop), mul*10*nudge, 0); // shift + else sp_selection_move(sp_desktop_selection(desktop), mul*nudge, 0); // no shift } ret = TRUE; } @@ -969,12 +969,12 @@ sp_select_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(event)) { // alt - if (MOD__SHIFT(event)) sp_selection_move_screen(desktop, 0, mul*-10); // shift - else sp_selection_move_screen(desktop, 0, mul*-1); // no shift + if (MOD__SHIFT(event)) sp_selection_move_screen(sp_desktop_selection(desktop), 0, mul*-10); // shift + else sp_selection_move_screen(sp_desktop_selection(desktop), 0, mul*-1); // no shift } else { // no alt - if (MOD__SHIFT(event)) sp_selection_move(desktop, 0, mul*-10*nudge); // shift - else sp_selection_move(desktop, 0, mul*-nudge); // no shift + if (MOD__SHIFT(event)) sp_selection_move(sp_desktop_selection(desktop), 0, mul*-10*nudge); // shift + else sp_selection_move(sp_desktop_selection(desktop), 0, mul*-nudge); // no shift } ret = TRUE; } |