From 82bf7794053238e29227d95f8baaac9cffdd8a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Thu, 9 Jun 2011 13:42:43 +0200 Subject: Disallow wheel zooming when holding mouse buttons. --- NEWS | 1 + liblogdiag/ld-diagram-view.c | 4 ++++ 2 files changed, 5 insertions(+) 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); -- cgit v1.2.3