Use standard subplot window in macosx backend

QuLogic · QuLogic · commit 4896d83934b0 · 2021-11-18T20:34:47.000-05:00
Fixes #21648
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -221,14 +221,6 @@ - (BOOL)closeButtonPressed;
 - (void)dealloc;
 @end
 
-@interface ToolWindow : NSWindow
-{
-}
-- (ToolWindow*)initWithContentRect:(NSRect)rect master:(NSWindow*)window;
-- (void)masterCloses:(NSNotification*)notification;
-- (void)close;
-@end
-
 @interface View : NSView <NSWindowDelegate>
 {   PyObject* canvas;
     NSRect rubberband;
@@ -1000,74 +992,48 @@ -(void)zoom:(id)sender
 }
 
 -(void)configure_subplots:(id)sender
-{   PyObject* canvas;
-    View* view;
-    PyObject* size;
-    NSRect rect;
-    int width, height;
+{
+    PyObject *mod = NULL, *base_class = NULL, *ret = NULL;
+    PyObject *subplot_tool = NULL, *subplot_figure = NULL, *subplot_canvas = NULL;
 
-    rect.origin.x = 100;
-    rect.origin.y = 350;
     PyGILState_STATE gstate = PyGILState_Ensure();
-    PyObject* master = PyObject_GetAttrString(toolbar, "canvas");
-    if (master==nil)
-    {
-        PyErr_Print();
-        PyGILState_Release(gstate);
-        return;
-    }
-    canvas = PyObject_CallMethod(toolbar, "prepare_configure_subplots", "");
-    if(!canvas)
-    {
-        PyErr_Print();
-        Py_DECREF(master);
-        PyGILState_Release(gstate);
-        return;
-    }
 
-    view = ((FigureCanvas*)canvas)->view;
-    if (!view) /* Something really weird going on */
-    {
-        PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
+    /* Prepare the subplot tool via the superclass. */
+    if (!(mod = PyImport_ImportModule("matplotlib.backend_bases"))
+        || !(base_class = PyObject_GetAttrString(mod, "NavigationToolbar2"))
+        || !(ret = PyObject_CallMethod(base_class, "configure_subplots",
+                                       "O", toolbar))) {
         PyErr_Print();
-        Py_DECREF(canvas);
-        Py_DECREF(master);
-        PyGILState_Release(gstate);
-        return;
+        goto exit;
     }
 
-    size = PyObject_CallMethod(canvas, "get_width_height", "");
-    Py_DECREF(canvas);
-    if(!size)
-    {
+    /* The subplot_tool attribute is set by the superclass method. */
+    if (!(subplot_tool = PyObject_GetAttrString(toolbar, "subplot_tool"))
+        || !(subplot_figure = PyObject_GetAttrString(subplot_tool, "figure"))
+        || !(subplot_canvas = PyObject_GetAttrString(subplot_figure, "canvas"))) {
         PyErr_Print();
-        Py_DECREF(master);
-        PyGILState_Release(gstate);
-        return;
+        goto exit;
     }
 
-    int ok = PyArg_ParseTuple(size, "ii", &width, &height);
-    Py_DECREF(size);
-    if (!ok)
+    if (!((FigureCanvas*)subplot_canvas)->view) /* Something really weird going on */
     {
+        PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
         PyErr_Print();
-        Py_DECREF(master);
-        PyGILState_Release(gstate);
-        return;
+        goto exit;
     }
 
-    NSWindow* mw = [((FigureCanvas*)master)->view window];
-    Py_DECREF(master);
-    PyGILState_Release(gstate);
+    NSWindow* child = [((FigureCanvas*)subplot_canvas)->view window];
+    [child setStyleMask: [child styleMask] | NSWindowStyleMaskUtilityWindow];
 
-    rect.size.width = width;
-    rect.size.height = height;
+exit:
+    Py_XDECREF(subplot_canvas);
+    Py_XDECREF(subplot_figure);
+    Py_XDECREF(subplot_tool);
+    Py_XDECREF(ret);
+    Py_XDECREF(base_class);
+    Py_XDECREF(mod);
 
-    ToolWindow* window = [ [ToolWindow alloc] initWithContentRect: rect
-                                                           master: mw];
-    [window setContentView: view];
-    [view release];
-    [window makeKeyAndOrderFront: nil];
+    PyGILState_Release(gstate);
 }
 
 -(void)save_figure:(id)sender
@@ -1524,36 +1490,6 @@ - (void)dealloc
 }
 @end
 
-@implementation ToolWindow
-- (ToolWindow*)initWithContentRect:(NSRect)rect master:(NSWindow*)window
-{
-    [self initWithContentRect: rect
-                    styleMask: NSWindowStyleMaskTitled
-                             | NSWindowStyleMaskClosable
-                             | NSWindowStyleMaskResizable
-                             | NSWindowStyleMaskMiniaturizable
-                      backing: NSBackingStoreBuffered
-                        defer: YES];
-    [self setTitle: @"Subplot Configuration Tool"];
-    [[NSNotificationCenter defaultCenter] addObserver: self
-                                             selector: @selector(masterCloses:)
-                                                 name: NSWindowWillCloseNotification
-                                               object: window];
-    return self;
-}
-
-- (void)masterCloses:(NSNotification*)notification
-{
-    [self close];
-}
-
-- (void)close
-{
-    [[NSNotificationCenter defaultCenter] removeObserver: self];
-    [super close];
-}
-@end
-
 @implementation View
 - (BOOL)isFlipped
 {
