gtk3&4

Author: AdwaithBatchu

lib/matplotlib/backends/backend_gtk3.py

@@ -591,6 +591,20 @@ class FigureManagerGTK3(_FigureManagerGTK):
     _toolbar2_class = NavigationToolbar2GTK3
     _toolmanager_toolbar_class = ToolbarGTK3
 
+    def context_menu(self, event, labels=None, actions=None):
+        if labels is None or actions is None:
+            return
+        menu = Gtk.Menu()
+        for label, action in zip(labels, actions):
+            item = Gtk.MenuItem(label=label)
+            menu.append(item)
+            def draw_lambda(_w, a=action):
+                a()
+                self.canvas.draw()
+            item.connect('activate', draw_lambda)
+            item.show()
+        menu.popup_at_pointer(event.guiEvent)
+
 
 @_BackendGTK.export
 class _BackendGTK3(_BackendGTK):

lib/matplotlib/backends/backend_gtk4.py

@@ -637,6 +637,34 @@ class FigureManagerGTK4(_FigureManagerGTK):
     _toolbar2_class = NavigationToolbar2GTK4
     _toolmanager_toolbar_class = ToolbarGTK4
 
+    def context_menu(self, event, labels=None, actions=None):
+        if labels is None or actions is None:
+            return
+        popover = Gtk.Popover()
+        popover.set_parent(self.window)
+        popover.set_has_arrow(False)
+        box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
+        popover.set_child(box)
+        for label, action in zip(labels, actions):
+            btn = Gtk.Button(label=label)
+            def draw_lambda(_btn, a=action, p=popover):
+                a()
+                self.canvas.draw()
+                p.popdown()
+            btn.connect('clicked', draw_lambda)
+            box.append(btn)
+        scale = self.canvas.get_scale_factor()
+        x_canvas = (event.x / scale)
+        y_canvas = ((self.canvas.get_height() * scale - event.y) / scale)
+        x_win,y_win = self.canvas.translate_coordinates(self.window, x_canvas, y_canvas)
+        rect = Gdk.Rectangle()
+        rect.x = x_win
+        rect.y = y_win
+        rect.width = 1
+        rect.height = 1
+        popover.set_pointing_to(rect)
+        popover.popup()
+
 
 @_BackendGTK.export
 class _BackendGTK4(_BackendGTK):

lib/mpl_toolkits/mplot3d/axes3d.py

@@ -188,7 +188,7 @@ def __init__(
         pseudo_bbox = self.transLimits.inverted().transform([(0, 0), (1, 1)])
         self._pseudo_w, self._pseudo_h = pseudo_bbox[1] - pseudo_bbox[0]
 
-        self._right_click_moved = False
+        self._mouse_moved = False
 
         # mplot3d currently manages its own spines and needs these turned off
         # for bounding box calculations
@@ -1360,7 +1360,7 @@ def clear(self):
 
     def _button_press(self, event):
         if event.inaxes == self:
-            self._right_click_moved = False
+            self._mouse_moved = False
             self.button_pressed = event.button
             self._sx, self._sy = event.xdata, event.ydata
             toolbar = self.get_figure(root=True).canvas.toolbar
@@ -1373,7 +1373,7 @@ def _button_release(self, event):
         self.button_pressed = None
 
         if event.button in self._zoom_btn and event.inaxes == self \
-            and not self._right_click_moved:
+            and not self._mouse_moved:
             canvas = self.get_figure(root=True).canvas
             canvas.manager.context_menu(
                 event,
@@ -1638,7 +1638,7 @@ def _on_move(self, event):
         # Zoom
         elif self.button_pressed in self._zoom_btn:
             # zoom view (dragging down zooms in)
-            self._right_click_moved = True
+            self._mouse_moved = True
             scale = h/(h - dy)
             self._scale_axis_limits(scale, scale, scale)