Merge pull request #4101 from blink1073/pass-qt-guievents

pelson · pelson · commit bbdfeaad4fa6 · 2015-02-15T20:21:44.000Z
Add guiEvent data to Qt backend
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -248,19 +248,20 @@ def __timerEvent(self, event):
         self.mpl_idle_event(event)
 
     def enterEvent(self, event):
-        FigureCanvasBase.enter_notify_event(self, event)
+        FigureCanvasBase.enter_notify_event(self, event, guiEvent=event)
 
     def leaveEvent(self, event):
         QtWidgets.QApplication.restoreOverrideCursor()
-        FigureCanvasBase.leave_notify_event(self, event)
+        FigureCanvasBase.leave_notify_event(self, event, guiEvent=event)
 
     def mousePressEvent(self, event):
         x = event.pos().x()
         # flipy so y=0 is bottom of canvas
         y = self.figure.bbox.height - event.pos().y()
         button = self.buttond.get(event.button())
         if button is not None:
-            FigureCanvasBase.button_press_event(self, x, y, button)
+            FigureCanvasBase.button_press_event(self, x, y, button,
+                                                guiEvent=event)
         if DEBUG:
             print('button pressed:', event.button())
 
@@ -271,15 +272,16 @@ def mouseDoubleClickEvent(self, event):
         button = self.buttond.get(event.button())
         if button is not None:
             FigureCanvasBase.button_press_event(self, x, y,
-                                                button, dblclick=True)
+                                                button, dblclick=True,
+                                                guiEvent=event)
         if DEBUG:
             print('button doubleclicked:', event.button())
 
     def mouseMoveEvent(self, event):
         x = event.x()
         # flipy so y=0 is bottom of canvas
         y = self.figure.bbox.height - event.y()
-        FigureCanvasBase.motion_notify_event(self, x, y)
+        FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
         # if DEBUG: print('mouse move')
 
     def mouseReleaseEvent(self, event):
@@ -288,7 +290,8 @@ def mouseReleaseEvent(self, event):
         y = self.figure.bbox.height - event.y()
         button = self.buttond.get(event.button())
         if button is not None:
-            FigureCanvasBase.button_release_event(self, x, y, button)
+            FigureCanvasBase.button_release_event(self, x, y, button,
+                                                  guiEvent=event)
         if DEBUG:
             print('button released')
 
@@ -303,7 +306,7 @@ def wheelEvent(self, event):
             steps = event.pixelDelta().y()
 
         if steps != 0:
-            FigureCanvasBase.scroll_event(self, x, y, steps)
+            FigureCanvasBase.scroll_event(self, x, y, steps, guiEvent=event)
             if DEBUG:
                 print('scroll event: delta = %i, '
                       'steps = %i ' % (event.delta(), steps))
@@ -312,15 +315,15 @@ def keyPressEvent(self, event):
         key = self._get_key(event)
         if key is None:
             return
-        FigureCanvasBase.key_press_event(self, key)
+        FigureCanvasBase.key_press_event(self, key, guiEvent=event)
         if DEBUG:
             print('key press', key)
 
     def keyReleaseEvent(self, event):
         key = self._get_key(event)
         if key is None:
             return
-        FigureCanvasBase.key_release_event(self, key)
+        FigureCanvasBase.key_release_event(self, key, guiEvent=event)
         if DEBUG:
             print('key release', key)
 
