aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2011-06-09 13:42:43 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2011-06-09 21:11:41 +0200
commit82bf7794053238e29227d95f8baaac9cffdd8a59 (patch)
tree5d32b8b8afabb48b9b6018c79f7235545715d14e
parentcd66c3d84a3795694e67fa80f453ee34e0ff285a (diff)
downloadlogdiag-82bf7794053238e29227d95f8baaac9cffdd8a59.tar.gz
logdiag-82bf7794053238e29227d95f8baaac9cffdd8a59.tar.xz
logdiag-82bf7794053238e29227d95f8baaac9cffdd8a59.zip
Disallow wheel zooming when holding mouse buttons.
-rw-r--r--NEWS1
-rw-r--r--liblogdiag/ld-diagram-view.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 7fd5808..0652748 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
Version TBD
- Fixed checking for the shift key when selecting.
- Terminals are ignored when hovering the cursor above a selection.
+ - Disallowed wheel zooming when holding mouse buttons.
Version 0.1.2
- Updated symbol library.
diff --git a/liblogdiag/ld-diagram-view.c b/liblogdiag/ld-diagram-view.c
index 18912f4..e28ec7a 100644
--- a/liblogdiag/ld-diagram-view.c
+++ b/liblogdiag/ld-diagram-view.c
@@ -2298,6 +2298,10 @@ on_scroll (GtkWidget *widget, GdkEventScroll *event, gpointer user_data)
point.y = event->y;
self = LD_DIAGRAM_VIEW (widget);
+ if (self->priv->operation != OPER_0
+ && self->priv->operation != OPER_ADD_OBJECT)
+ return TRUE;
+
ld_diagram_view_widget_to_diagram_coords (self,
event->x, event->y, &prev_x, &prev_y);