From 41ca223c456807d2c7a03ca17b7587d3dde08c75 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Tue, 8 Mar 2016 15:53:27 +0100 Subject: [PATCH] gui: ignore only unmodified wheelevents --- artiq/gui/tools.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/gui/tools.py b/artiq/gui/tools.py index 97964bf4c..7782165d6 100644 --- a/artiq/gui/tools.py +++ b/artiq/gui/tools.py @@ -17,11 +17,11 @@ def log_level_to_name(level): class _WheelFilter(QtCore.QObject): def eventFilter(self, obj, event): - if event.type() == QtCore.QEvent.Wheel: + if (event.type() == QtCore.QEvent.Wheel and + event.modifiers() == QtCore.Qt.NoModifier): event.ignore() return True - else: - return False + return False def disable_scroll_wheel(widget):