diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-07-14 21:09:41 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-07-14 21:09:41 +0000 |
| commit | d32efb61f1c2c18d1018e510bbe9bafc04a03905 (patch) | |
| tree | b447bf9856baf1cf485e38c4ce55edb27285129e /src/dyna-draw-context.cpp | |
| parent | Merged from trunk (r12305) (diff) | |
| parent | Minor C++ish refactoring pass. (diff) | |
| download | inkscape-d32efb61f1c2c18d1018e510bbe9bafc04a03905.tar.gz inkscape-d32efb61f1c2c18d1018e510bbe9bafc04a03905.zip | |
Merged from trunk (r12419).
(bzr r11608.1.107)
Diffstat (limited to 'src/dyna-draw-context.cpp')
| -rw-r--r-- | src/dyna-draw-context.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp index 233c27f10..894fa91b5 100644 --- a/src/dyna-draw-context.cpp +++ b/src/dyna-draw-context.cpp @@ -851,7 +851,7 @@ gint SPDynaDrawContext::root_handler(GdkEvent* event) { 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; @@ -861,7 +861,7 @@ gint SPDynaDrawContext::root_handler(GdkEvent* event) { 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; @@ -871,7 +871,7 @@ gint SPDynaDrawContext::root_handler(GdkEvent* event) { 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; @@ -881,7 +881,7 @@ gint SPDynaDrawContext::root_handler(GdkEvent* event) { 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; @@ -903,7 +903,7 @@ gint SPDynaDrawContext::root_handler(GdkEvent* event) { break; case GDK_KEY_x: case GDK_KEY_X: - if (MOD__ALT_ONLY) { + if (MOD__ALT_ONLY(event)) { desktop->setToolboxFocusTo ("altx-calligraphy"); ret = TRUE; } @@ -917,7 +917,7 @@ gint SPDynaDrawContext::root_handler(GdkEvent* event) { 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; @@ -997,10 +997,10 @@ set_to_accumulated(SPDynaDrawContext *dc, bool unionize, bool subtract) if (unionize) { sp_desktop_selection(desktop)->add(dc->repr); - sp_selected_path_union_skip_undo(desktop); + sp_selected_path_union_skip_undo(sp_desktop_selection(desktop), desktop); } else if (subtract) { sp_desktop_selection(desktop)->add(dc->repr); - sp_selected_path_diff_skip_undo(desktop); + sp_selected_path_diff_skip_undo(sp_desktop_selection(desktop), desktop); } else { if (dc->keep_selected) { sp_desktop_selection(desktop)->set(dc->repr); |