diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-05-05 11:58:23 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-05-05 11:58:23 +0000 |
| commit | 129e599f69d69970d27f827159d563d58c7831b9 (patch) | |
| tree | fa15e756067f688a61f39da90793d4da90ea0176 /src/dyna-draw-context.cpp | |
| parent | merge from trunk (r12305) (diff) | |
| parent | Fix for 1171434 : trunk: INX <optiongroup> broken^ (diff) | |
| download | inkscape-129e599f69d69970d27f827159d563d58c7831b9.tar.gz inkscape-129e599f69d69970d27f827159d563d58c7831b9.zip | |
merge from trunk (r12322)
(bzr r11668.1.69)
Diffstat (limited to 'src/dyna-draw-context.cpp')
| -rw-r--r-- | src/dyna-draw-context.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp index 742d52f09..605e487ab 100644 --- a/src/dyna-draw-context.cpp +++ b/src/dyna-draw-context.cpp @@ -854,7 +854,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, switch (get_group0_keyval (&event->key)) { case GDK_KEY_Up: case GDK_KEY_KP_Up: - if (!MOD__CTRL_ONLY) { + if (!MOD__CTRL_ONLY(event)) { dc->angle += 5.0; if (dc->angle > 90.0) dc->angle = 90.0; @@ -864,7 +864,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, break; case GDK_KEY_Down: case GDK_KEY_KP_Down: - if (!MOD__CTRL_ONLY) { + if (!MOD__CTRL_ONLY(event)) { dc->angle -= 5.0; if (dc->angle < -90.0) dc->angle = -90.0; @@ -874,7 +874,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, break; case GDK_KEY_Right: case GDK_KEY_KP_Right: - if (!MOD__CTRL_ONLY) { + if (!MOD__CTRL_ONLY(event)) { dc->width += 0.01; if (dc->width > 1.0) dc->width = 1.0; @@ -884,7 +884,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, break; case GDK_KEY_Left: case GDK_KEY_KP_Left: - if (!MOD__CTRL_ONLY) { + if (!MOD__CTRL_ONLY(event)) { dc->width -= 0.01; if (dc->width < 0.01) dc->width = 0.01; @@ -906,7 +906,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, break; case GDK_KEY_x: case GDK_KEY_X: - if (MOD__ALT_ONLY) { + if (MOD__ALT_ONLY(event)) { desktop->setToolboxFocusTo ("altx-calligraphy"); ret = TRUE; } @@ -920,7 +920,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, break; case GDK_KEY_z: case GDK_KEY_Z: - if (MOD__CTRL_ONLY && dc->is_drawing) { + if (MOD__CTRL_ONLY(event) && dc->is_drawing) { // if drawing, cancel, otherwise pass it up for undo calligraphic_cancel (dc); ret = TRUE; |