diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-03-20 14:41:56 +0000 |
|---|---|---|
| committer | Jabiertxof <jabier.arraiza@marker.es> | 2019-03-20 14:41:56 +0000 |
| commit | 7b720a2568de95466cc91be47351e0d507a33087 (patch) | |
| tree | 7340330c8f5bbb3372fb0e897909d1a5bb552dc5 /src/ui | |
| parent | Remove leftover popt references in build files (diff) | |
| download | inkscape-7b720a2568de95466cc91be47351e0d507a33087.tar.gz inkscape-7b720a2568de95466cc91be47351e0d507a33087.zip | |
Avoid cancel dragging a item when right click presed
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/tools/select-tool.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp index 93ff8d1d2..44968887a 100644 --- a/src/ui/tools/select-tool.cpp +++ b/src/ui/tools/select-tool.cpp @@ -333,7 +333,7 @@ bool SelectTool::item_handler(SPItem* item, GdkEvent* event) { ret = TRUE; } - } else if (event->button.button == 3) { + } else if (event->button.button == 3 && !this->dragging) { // right click; do not eat it so that right-click menu can appear, but cancel dragging & rubberband this->sp_select_context_abort(); } diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 729992152..df0962852 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -1149,6 +1149,7 @@ static void set_event_location(SPDesktop *desktop, GdkEvent *event) { */ void sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event) { + if(this->dragging) // It seems the param item is the SPItem at the bottom of the z-order // Using the same function call used on left click in sp_select_context_item_handler() to get top of z-order // fixme: sp_canvas_arena should set the top z-order object as arena->active |