Set the app icon in the MacOsX manager

joelfrederico · joelfrederico · commit 310a819c7327 · 2021-12-03T00:30:31.000-08:00
Minor fixes


Be more pythonic - fail safely rather than prevent failure

Some image types may not be handled. OS updates may change which image types are valid. Rather than check, the code will fail if pdf's aren't allowed. If we need more complexity than that, we can update the code.
Change to static method for setting icon
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -67,6 +67,8 @@ class FigureManagerMac(_macosx.FigureManager, FigureManagerBase):
     """
     def __init__(self, canvas, num):
         _macosx.FigureManager.__init__(self, canvas)
+        icon_path = str(cbook._get_data_path('images/matplotlib.pdf'))
+        _macosx.FigureManager.set_icon(icon_path)
         FigureManagerBase.__init__(self, canvas, num)
         if mpl.rcParams['toolbar'] == 'toolbar2':
             self.toolbar = NavigationToolbar2Mac(canvas)
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -611,24 +611,25 @@ static CGFloat _get_device_scale(CGContextRef cr)
     View* view;
     PyObject* size;
     int width, height;
-    PyObject* obj;
     FigureCanvas* canvas;
 
     if (!self->window) {
         PyErr_SetString(PyExc_RuntimeError, "NSWindow* is NULL");
         return -1;
     }
+    static char* kwlist[3] = { "canvas", NULL };
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", kwlist,
+	  &FigureCanvasType, &canvas)) {
+        return -1;
+    }
 
-    if (!PyArg_ParseTuple(args, "O", &obj)) { return -1; }
-
-    canvas = (FigureCanvas*)obj;
     view = canvas->view;
     if (!view) { /* Something really weird going on */
         PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
         return -1;
     }
 
-    size = PyObject_CallMethod(obj, "get_width_height", "");
+    size = PyObject_CallMethod((PyObject*)canvas, "get_width_height", "");
     if (!size) { return -1; }
     if (!PyArg_ParseTuple(size, "ii", &width, &height)) {
         Py_DECREF(size);
@@ -697,6 +698,41 @@ static CGFloat _get_device_scale(CGContextRef cr)
     Py_RETURN_NONE;
 }
 
+static PyObject*
+FigureManager_set_icon(PyObject* null, PyObject* args, PyObject* kwds) {
+    PyObject* icon_path;
+    static char* kwlist[3] = { "icon_path", NULL };
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kwlist,
+	  &PyUnicode_FSDecoder, &icon_path)) {
+	return NULL;
+    }
+    const char* icon_path_ptr = PyUnicode_AsUTF8(icon_path);
+    if (!icon_path_ptr) {
+        Py_DECREF(icon_path);
+        return NULL;
+    }
+    @autoreleasepool {
+        NSString* ns_icon_path = [NSString stringWithUTF8String: icon_path_ptr];
+	Py_DECREF(icon_path);
+        if (!ns_icon_path) {
+            PyErr_SetString(PyExc_RuntimeError, "Could not convert to NSString*");
+            return NULL;
+        }
+        NSImage* image = [[[NSImage alloc] initByReferencingFile: ns_icon_path] autorelease];
+        if (!image) {
+            PyErr_SetString(PyExc_RuntimeError, "Could not create NSImage*");
+            return NULL;
+        }
+        if (!image.valid) {
+            PyErr_SetString(PyExc_RuntimeError, "Image is not valid");
+            return NULL;
+        }
+        NSApplication* app = [NSApplication sharedApplication];
+        app.applicationIconImage = image;
+    }
+    Py_RETURN_NONE;
+}
+
 static PyObject*
 FigureManager_set_window_title(FigureManager* self,
                                PyObject *args, PyObject *kwds)
@@ -769,6 +805,10 @@ static CGFloat _get_device_scale(CGContextRef cr)
         {"destroy",
          (PyCFunction)FigureManager_destroy,
          METH_NOARGS},
+	{"set_icon",
+    	 (PyCFunction)FigureManager_set_icon,
+    	 METH_STATIC | METH_VARARGS | METH_KEYWORDS,
+	 "Set application icon"},
         {"set_window_title",
          (PyCFunction)FigureManager_set_window_title,
          METH_VARARGS},
