Merge pull request #22928 from greglucas/macosx-raise-window

oscargus · web-flow · commit e26efa5d9ee0 · 2022-04-29T09:24:23.000+02:00
ENH: Add option to disable raising the window for macosx
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -140,6 +140,7 @@ class FigureManagerMac(_macosx.FigureManager, FigureManagerBase):
     _toolbar2_class = NavigationToolbar2Mac
 
     def __init__(self, canvas, num):
+        self._shown = False
         _macosx.FigureManager.__init__(self, canvas)
         icon_path = str(cbook._get_data_path('images/matplotlib.pdf'))
         _macosx.FigureManager.set_icon(icon_path)
@@ -154,6 +155,13 @@ def close(self):
         Gcf.destroy(self)
         self.canvas.flush_events()
 
+    def show(self):
+        if not self._shown:
+            self._show()
+            self._shown = True
+        if mpl.rcParams["figure.raise_window"]:
+            self._raise()
+
 
 @_Backend.export
 class _BackendMac(_Backend):
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -586,9 +586,15 @@ static CGFloat _get_device_scale(CGContextRef cr)
 }
 
 static PyObject*
-FigureManager_show(FigureManager* self)
+FigureManager__show(FigureManager* self)
 {
     [self->window makeKeyAndOrderFront: nil];
+    Py_RETURN_NONE;
+}
+
+static PyObject*
+FigureManager__raise(FigureManager* self)
+{
     [self->window orderFrontRegardless];
     Py_RETURN_NONE;
 }
@@ -695,8 +701,11 @@ static CGFloat _get_device_scale(CGContextRef cr)
     .tp_new = (newfunc)FigureManager_new,
     .tp_doc = "A FigureManager object wraps a Cocoa NSWindow object.",
     .tp_methods = (PyMethodDef[]){  // All docstrings are inherited.
-        {"show",
-         (PyCFunction)FigureManager_show,
+        {"_show",
+         (PyCFunction)FigureManager__show,
+         METH_NOARGS},
+        {"_raise",
+         (PyCFunction)FigureManager__raise,
          METH_NOARGS},
         {"destroy",
          (PyCFunction)FigureManager_destroy,
