diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-11-07 18:33:24 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-11-07 18:33:24 +0000 |
| commit | 46d3c703414abe90dfbe79befbd0b4c80a86ea36 (patch) | |
| tree | f882dd4e4436137a6349c9a456374d7a788f39b5 | |
| parent | Update to trunk (diff) | |
| download | inkscape-46d3c703414abe90dfbe79befbd0b4c80a86ea36.tar.gz inkscape-46d3c703414abe90dfbe79befbd0b4c80a86ea36.zip | |
Fix some bugs pointed by vlada
(bzr r15142.1.35)
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index fba9ae94f..c789b44bb 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -381,7 +381,7 @@ bool ToolBase::root_handler(GdkEvent* event) { desktop->canvas->startRotateTo(desktop->namedview->document_rotation); this->rotating_mode = true; this->message_context->set(Inkscape::INFORMATION_MESSAGE, - _("<b>Space+ALT+mouse move</b> to rotate canvas")); + _("<b>MMB + mouse move</b> to rotate canvas, use modifiers on screen to change snaps")); } else { if (event->button.state & GDK_SHIFT_MASK) { zoom_rb = 2; @@ -397,10 +397,7 @@ bool ToolBase::root_handler(GdkEvent* event) { | GDK_POINTER_MOTION_HINT_MASK, NULL, event->button.time - 1); } - desktop->canvas->clearRotateTo(); - this->rotating_mode = false; ret = TRUE; - desktop->canvas->endRotateTo(); } ret = TRUE; break; @@ -422,8 +419,6 @@ bool ToolBase::root_handler(GdkEvent* event) { } else if( !this->space_panning) { sp_event_root_menu_popup(desktop, NULL, event); } - desktop->canvas->clearRotateTo(); - this->rotating_mode = false; ret = TRUE; break; @@ -464,7 +459,7 @@ bool ToolBase::root_handler(GdkEvent* event) { | GDK_POINTER_MOTION_HINT_MASK, NULL, event->motion.time - 1); } - if (panning) { + if (panning && !this->rotating_mode) { if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK)) || (panning == 1 && !(event->motion.state & GDK_BUTTON1_MASK)) || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK))) { @@ -738,7 +733,7 @@ bool ToolBase::root_handler(GdkEvent* event) { desktop->canvas->startRotateTo(desktop->namedview->document_rotation); this->rotating_mode = true; this->message_context->set(Inkscape::INFORMATION_MESSAGE, - _("<b>Space+ALT+mouse move</b> to rotate canvas")); + _("<b>Space+mouse move</b> to rotate canvas, use modifiers on screen to change snaps")); } else { within_tolerance = true; xp = yp = 0; |