Merge pull request #22153 from meeseeksmachine/auto-backport-of-pr-22147-on-v3.5.x

timhoffm · web-flow · commit 132d7135a743 · 2022-01-08T09:28:13.000+01:00
Backport PR #22147 on branch v3.5.x (Fix loading user-defined icons for Tk toolbar)
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -636,9 +636,15 @@ def _set_image_for_button(self, button):
         if button._image_file is None:
             return
 
+        # Allow _image_file to be relative to Matplotlib's "images" data
+        # directory.
+        path_regular = cbook._get_data_path('images', button._image_file)
+        path_large = path_regular.with_name(
+            path_regular.name.replace('.png', '_large.png'))
         size = button.winfo_pixels('18p')
-        with Image.open(button._image_file.replace('.png', '_large.png')
-                        if size > 24 else button._image_file) as im:
+        # Use the high-resolution (48x48 px) icon if it exists and is needed
+        with Image.open(path_large if (size > 24 and path_large.exists())
+                        else path_regular) as im:
             image = ImageTk.PhotoImage(im.resize((size, size)), master=self)
         button.configure(image=image, height='18p', width='18p')
         button._ntimage = image  # Prevent garbage collection.
