scanwidget: wheel event handling cleanup (380634e)

m-labs · Mar 14, 2016 · fc60f35 · fc60f35
1 parent 2e73d6c
commit fc60f35
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/artiq/gui/scanwidget.py b/artiq/gui/scanwidget.py
@@ -364,7 +364,7 @@ def _handleZoom(self, zoomFactor, mouseXPos):
             return
         self.setView(newLeft, newScale)
 
-    def _wheelEvent(self, ev):
+    def wheelEvent(self, ev):
         y = ev.angleDelta().y()
         if ev.modifiers() & QtCore.Qt.ShiftModifier:
             # If shift+scroll, modify number of points.
@@ -405,7 +405,7 @@ def resizeEvent(self, ev):
 
     def eventFilter(self, obj, ev):
         if ev.type() == QtCore.QEvent.Wheel:
-            self._wheelEvent(ev)
+            ev.ignore()
             return True
         if ev.type() == QtCore.QEvent.Resize:
             ev.ignore()