Button image_subsample paramter now works if no size is set

PySimpleGUI · Jan 16, 2019 · ee81ce6 · ee81ce6
1 parent 9e6d846
commit ee81ce6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/PySimpleGUI.py b/PySimpleGUI.py
@@ -4917,21 +4917,21 @@ def CharWidthInPixels():
                 if element.ImageFilename:  # if button has an image on it
                     tkbutton.config(highlightthickness=0)
                     photo = tk.PhotoImage(file=element.ImageFilename)
+                    if element.ImageSubsample:
+                        photo = photo.subsample(element.ImageSubsample)
                     if element.ImageSize != (None, None):
                         width, height = element.ImageSize
-                        if element.ImageSubsample:
-                            photo = photo.subsample(element.ImageSubsample)
                     else:
                         width, height = photo.width(), photo.height()
                     tkbutton.config(image=photo, compound=tk.CENTER, width=width, height=height)
                     tkbutton.image = photo
                 if element.ImageData:  # if button has an image on it
                     tkbutton.config(highlightthickness=0)
                     photo = tk.PhotoImage(data=element.ImageData)
+                    if element.ImageSubsample:
+                        photo = photo.subsample(element.ImageSubsample)
                     if element.ImageSize != (None, None):
                         width, height = element.ImageSize
-                        if element.ImageSubsample:
-                            photo = photo.subsample(element.ImageSubsample)
                     else:
                         width, height = photo.width(), photo.height()
                     tkbutton.config(image=photo, compound=tk.CENTER, width=width, height=height)