diff options
Diffstat (limited to 'src/spray-context.cpp')
| -rw-r--r-- | src/spray-context.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/spray-context.cpp b/src/spray-context.cpp index 6a5684891..b8172fa4c 100644 --- a/src/spray-context.cpp +++ b/src/spray-context.cpp @@ -642,7 +642,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even tc->has_dilated = false; if(tc->is_dilating && event->button.button == 1 && !event_context->space_panning) { - sp_spray_dilate(tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT); + sp_spray_dilate(tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event)); } tc->has_dilated = true; @@ -735,7 +735,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even if (!tc->has_dilated) { // if we did not rub, do a light tap tc->pressure = 0.03; - sp_spray_dilate(tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT); + sp_spray_dilate(tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event)); } tc->is_dilating = false; tc->has_dilated = false; @@ -761,28 +761,28 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even switch (get_group0_keyval (&event->key)) { case GDK_KEY_j: case GDK_KEY_J: - if (MOD__SHIFT_ONLY) { - sp_spray_switch_mode(tc, SPRAY_MODE_COPY, MOD__SHIFT); + if (MOD__SHIFT_ONLY(event)) { + sp_spray_switch_mode(tc, SPRAY_MODE_COPY, MOD__SHIFT(event)); ret = TRUE; } break; case GDK_KEY_k: case GDK_KEY_K: - if (MOD__SHIFT_ONLY) { - sp_spray_switch_mode(tc, SPRAY_MODE_CLONE, MOD__SHIFT); + if (MOD__SHIFT_ONLY(event)) { + sp_spray_switch_mode(tc, SPRAY_MODE_CLONE, MOD__SHIFT(event)); ret = TRUE; } break; case GDK_KEY_l: case GDK_KEY_L: - if (MOD__SHIFT_ONLY) { - sp_spray_switch_mode(tc, SPRAY_MODE_SINGLE_PATH, MOD__SHIFT); + if (MOD__SHIFT_ONLY(event)) { + sp_spray_switch_mode(tc, SPRAY_MODE_SINGLE_PATH, MOD__SHIFT(event)); ret = TRUE; } break; case GDK_KEY_Up: case GDK_KEY_KP_Up: - if (!MOD__CTRL_ONLY) { + if (!MOD__CTRL_ONLY(event)) { tc->population += 0.01; if (tc->population > 1.0) { tc->population = 1.0; @@ -793,7 +793,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even break; case GDK_KEY_Down: case GDK_KEY_KP_Down: - if (!MOD__CTRL_ONLY) { + if (!MOD__CTRL_ONLY(event)) { tc->population -= 0.01; if (tc->population < 0.0) { tc->population = 0.0; @@ -804,7 +804,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even break; case GDK_KEY_Right: case GDK_KEY_KP_Right: - if (!MOD__CTRL_ONLY) { + if (!MOD__CTRL_ONLY(event)) { tc->width += 0.01; if (tc->width > 1.0) { tc->width = 1.0; @@ -817,7 +817,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even break; case GDK_KEY_Left: case GDK_KEY_KP_Left: - if (!MOD__CTRL_ONLY) { + if (!MOD__CTRL_ONLY(event)) { tc->width -= 0.01; if (tc->width < 0.01) { tc->width = 0.01; @@ -843,7 +843,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even break; case GDK_KEY_x: case GDK_KEY_X: - if (MOD__ALT_ONLY) { + if (MOD__ALT_ONLY(event)) { desktop->setToolboxFocusTo("altx-spray"); ret = TRUE; } @@ -858,7 +858,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even case GDK_KEY_Delete: case GDK_KEY_KP_Delete: case GDK_KEY_BackSpace: - ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY); + ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event)); break; default: @@ -875,11 +875,11 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even break; case GDK_KEY_Control_L: case GDK_KEY_Control_R: - sp_spray_switch_mode (tc, prefs->getInt("/tools/spray/mode"), MOD__SHIFT); + sp_spray_switch_mode (tc, prefs->getInt("/tools/spray/mode"), MOD__SHIFT(event)); tc->_message_context->clear(); break; default: - sp_spray_switch_mode (tc, prefs->getInt("/tools/spray/mode"), MOD__SHIFT); + sp_spray_switch_mode (tc, prefs->getInt("/tools/spray/mode"), MOD__SHIFT(event)); break; } } |