summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/tool-base.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-10-23 19:18:11 +0000
committerjabiertxof <info@marker.es>2016-10-23 19:18:11 +0000
commitb65d3fdc9c15af81c5e433d8f1b714ef4ab61487 (patch)
treeaf8cc5ec762018954d19001e2521d44c63ca7341 /src/ui/tools/tool-base.cpp
parentAdd right click rotation panning (diff)
downloadinkscape-b65d3fdc9c15af81c5e433d8f1b714ef4ab61487.tar.gz
inkscape-b65d3fdc9c15af81c5e433d8f1b714ef4ab61487.zip
Add right click rotation panning, some fixes
(bzr r15142.1.23)
Diffstat (limited to 'src/ui/tools/tool-base.cpp')
-rw-r--r--src/ui/tools/tool-base.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 33c0492d7..f7315c648 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -516,7 +516,21 @@ bool ToolBase::root_handler(GdkEvent* event) {
break;
case GDK_BUTTON_RELEASE:
+ desktop->canvas->clearRotateTo();
if (this->space_panning && event->button.button == 3) {
+ xp = yp = 0;
+ if (panning_cursor == 1) {
+ panning_cursor = 0;
+ GtkWidget *w = GTK_WIDGET(this->desktop->getCanvas());
+ gdk_window_set_cursor(gtk_widget_get_window (w), this->cursor);
+ }
+ zoom_rb = 0;
+ if (panning) {
+ panning = 0;
+ sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+ event->button.time);
+ }
+ ret = TRUE;
if (desktop->canvas->endRotateTo()) {
sp_repr_set_svg_double(desktop->namedview->getRepr(), "inkscape:document-rotation", angle);
SPObject *updated = SP_OBJECT(desktop->namedview);
@@ -580,7 +594,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
ret = TRUE;
}
}
- desktop->canvas->clearRotateTo();
break;
case GDK_KEY_PRESS: {