diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-08-14 21:33:11 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-08-14 21:33:11 +0000 |
| commit | 181d1e66302e2a6296f228a74e4840b797b5eba7 (patch) | |
| tree | 0315e36d536286e813d19018f47eec191496948e /src/select-context.cpp | |
| parent | Remove further instances of SP_ACTIVE_DESKTOP (diff) | |
| download | inkscape-181d1e66302e2a6296f228a74e4840b797b5eba7.tar.gz inkscape-181d1e66302e2a6296f228a74e4840b797b5eba7.zip | |
Get rid of a whole bunch of further instances of SP_ACTIVE_DESKTOP (where the desktop is readily available in the calling function)
(bzr r6629)
Diffstat (limited to 'src/select-context.cpp')
| -rw-r--r-- | src/select-context.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/select-context.cpp b/src/select-context.cpp index 0957b8432..22b358dc7 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -726,12 +726,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) { // alt - if (MOD__SHIFT) sp_selection_move_screen(mul*-10, 0); // shift - else sp_selection_move_screen(mul*-1, 0); // no shift + if (MOD__SHIFT) sp_selection_move_screen(desktop, mul*-10, 0); // shift + else sp_selection_move_screen(desktop, mul*-1, 0); // no shift } else { // no alt - if (MOD__SHIFT) sp_selection_move(mul*-10*nudge, 0); // shift - else sp_selection_move(mul*-nudge, 0); // no shift + if (MOD__SHIFT) sp_selection_move(desktop, mul*-10*nudge, 0); // shift + else sp_selection_move(desktop, mul*-nudge, 0); // no shift } ret = TRUE; } @@ -743,12 +743,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) { // alt - if (MOD__SHIFT) sp_selection_move_screen(0, mul*10); // shift - else sp_selection_move_screen(0, mul*1); // no shift + if (MOD__SHIFT) sp_selection_move_screen(desktop, 0, mul*10); // shift + else sp_selection_move_screen(desktop, 0, mul*1); // no shift } else { // no alt - if (MOD__SHIFT) sp_selection_move(0, mul*10*nudge); // shift - else sp_selection_move(0, mul*nudge); // no shift + if (MOD__SHIFT) sp_selection_move(desktop, 0, mul*10*nudge); // shift + else sp_selection_move(desktop, 0, mul*nudge); // no shift } ret = TRUE; } @@ -760,12 +760,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) { // alt - if (MOD__SHIFT) sp_selection_move_screen(mul*10, 0); // shift - else sp_selection_move_screen(mul*1, 0); // no shift + if (MOD__SHIFT) sp_selection_move_screen(desktop, mul*10, 0); // shift + else sp_selection_move_screen(desktop, mul*1, 0); // no shift } else { // no alt - if (MOD__SHIFT) sp_selection_move(mul*10*nudge, 0); // shift - else sp_selection_move(mul*nudge, 0); // no shift + if (MOD__SHIFT) sp_selection_move(desktop, mul*10*nudge, 0); // shift + else sp_selection_move(desktop, mul*nudge, 0); // no shift } ret = TRUE; } @@ -777,12 +777,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) { // alt - if (MOD__SHIFT) sp_selection_move_screen(0, mul*-10); // shift - else sp_selection_move_screen(0, mul*-1); // no shift + if (MOD__SHIFT) sp_selection_move_screen(desktop, 0, mul*-10); // shift + else sp_selection_move_screen(desktop, 0, mul*-1); // no shift } else { // no alt - if (MOD__SHIFT) sp_selection_move(0, mul*-10*nudge); // shift - else sp_selection_move(0, mul*-nudge); // no shift + if (MOD__SHIFT) sp_selection_move(desktop, 0, mul*-10*nudge); // shift + else sp_selection_move(desktop, 0, mul*-nudge); // no shift } ret = TRUE; } @@ -795,7 +795,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_a: case GDK_A: if (MOD__CTRL_ONLY) { - sp_edit_select_all(); + sp_edit_select_all(desktop); ret = TRUE; } break; @@ -901,7 +901,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_g: case GDK_G: if (MOD__SHIFT_ONLY) { - sp_selection_to_guides(); + sp_selection_to_guides(desktop); ret = true; } break; |