diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-10-19 04:33:22 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-10-19 04:33:22 +0000 |
| commit | 2d7e690eb6a2add552b84370d56d56ec1b1fbfd4 (patch) | |
| tree | f5b76e1fbe3e2cf144d24697ce37018bf0401b86 /src/ui/tools | |
| parent | Update hr.po for Inkscape 1.0 (diff) | |
| download | inkscape-2d7e690eb6a2add552b84370d56d56ec1b1fbfd4.tar.gz inkscape-2d7e690eb6a2add552b84370d56d56ec1b1fbfd4.zip | |
Add export/import PDF blend modes and add isolation modifier
Diffstat (limited to 'src/ui/tools')
| -rw-r--r-- | src/ui/tools/node-tool.cpp | 5 | ||||
| -rw-r--r-- | src/ui/tools/select-tool.cpp | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp index 931e08d15..f994f85cf 100644 --- a/src/ui/tools/node-tool.cpp +++ b/src/ui/tools/node-tool.cpp @@ -31,6 +31,8 @@ #include "live_effects/effect.h" #include "live_effects/lpeobject.h" +#include "include/macros.h" + #include "object/sp-clippath.h" #include "object/sp-item-group.h" #include "object/sp-mask.h" @@ -498,7 +500,8 @@ bool NodeTool::root_handler(GdkEvent* event) { case GDK_MOTION_NOTIFY: { sp_update_helperpath(); SPItem *over_item = nullptr; - if (!desktop->canvas->_scrooling) { + if (!desktop->canvas->_scrooling || MOD__CTRL(event) || MOD__SHIFT(event) || MOD__ALT(event)) { + desktop->canvas->_scrooling = false; combine_motion_events(desktop->canvas, event->motion, 0); over_item = sp_event_context_find_item(desktop, event_point(event->button), FALSE, TRUE); } diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index 9bd97fabc..6d5fdd2b9 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -554,7 +554,6 @@ bool SelectTool::root_handler(GdkEvent* event) { if ((event->motion.state & GDK_BUTTON1_MASK) && !this->space_panning) { Geom::Point const motion_pt(event->motion.x, event->motion.y); Geom::Point const p(desktop->w2d(motion_pt)); - if ( within_tolerance && ( abs( (gint) event->motion.x - xp ) < tolerance ) && ( abs( (gint) event->motion.y - yp ) < tolerance ) ) { |