summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/tool-base.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-11-07 18:53:29 +0000
committerjabiertxof <info@marker.es>2016-11-07 18:53:29 +0000
commit7f2d487d23d4b0e95ceb8d1cc4ad6ffb18a32f90 (patch)
tree2555b1ef850c8fbdbacd256a373f42b1c9902d46 /src/ui/tools/tool-base.cpp
parentUpdate to trunk (diff)
downloadinkscape-7f2d487d23d4b0e95ceb8d1cc4ad6ffb18a32f90.tar.gz
inkscape-7f2d487d23d4b0e95ceb8d1cc4ad6ffb18a32f90.zip
Fix some bugs
(bzr r15142.1.37)
Diffstat (limited to 'src/ui/tools/tool-base.cpp')
-rw-r--r--src/ui/tools/tool-base.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index c789b44bb..ca700f652 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -373,6 +373,8 @@ bool ToolBase::root_handler(GdkEvent* event) {
ret = TRUE;
}
+ desktop->canvas->clearRotateTo();
+ this->rotating_mode = false;
break;
case 2:
@@ -420,6 +422,8 @@ bool ToolBase::root_handler(GdkEvent* event) {
sp_event_root_menu_popup(desktop, NULL, event);
}
ret = TRUE;
+ desktop->canvas->clearRotateTo();
+ this->rotating_mode = false;
break;
default:
@@ -836,9 +840,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
if (this->rotating_mode) {
desktop->canvas->clearRotateTo();
this->rotating_mode = false;
- ret = TRUE;
desktop->canvas->endRotateTo();
- break;
}
bool ctrl = (event->scroll.state & GDK_CONTROL_MASK);
bool wheelzooms = prefs->getBool("/options/wheelzooms/value");