Button image_subsample paramter now works if no size is set
This commit is contained in:
parent
9e6d846227
commit
ee81ce64fb
|
@ -4917,10 +4917,10 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form:Window):
|
||||||
if element.ImageFilename: # if button has an image on it
|
if element.ImageFilename: # if button has an image on it
|
||||||
tkbutton.config(highlightthickness=0)
|
tkbutton.config(highlightthickness=0)
|
||||||
photo = tk.PhotoImage(file=element.ImageFilename)
|
photo = tk.PhotoImage(file=element.ImageFilename)
|
||||||
if element.ImageSize != (None, None):
|
|
||||||
width, height = element.ImageSize
|
|
||||||
if element.ImageSubsample:
|
if element.ImageSubsample:
|
||||||
photo = photo.subsample(element.ImageSubsample)
|
photo = photo.subsample(element.ImageSubsample)
|
||||||
|
if element.ImageSize != (None, None):
|
||||||
|
width, height = element.ImageSize
|
||||||
else:
|
else:
|
||||||
width, height = photo.width(), photo.height()
|
width, height = photo.width(), photo.height()
|
||||||
tkbutton.config(image=photo, compound=tk.CENTER, width=width, height=height)
|
tkbutton.config(image=photo, compound=tk.CENTER, width=width, height=height)
|
||||||
|
@ -4928,10 +4928,10 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form:Window):
|
||||||
if element.ImageData: # if button has an image on it
|
if element.ImageData: # if button has an image on it
|
||||||
tkbutton.config(highlightthickness=0)
|
tkbutton.config(highlightthickness=0)
|
||||||
photo = tk.PhotoImage(data=element.ImageData)
|
photo = tk.PhotoImage(data=element.ImageData)
|
||||||
if element.ImageSize != (None, None):
|
|
||||||
width, height = element.ImageSize
|
|
||||||
if element.ImageSubsample:
|
if element.ImageSubsample:
|
||||||
photo = photo.subsample(element.ImageSubsample)
|
photo = photo.subsample(element.ImageSubsample)
|
||||||
|
if element.ImageSize != (None, None):
|
||||||
|
width, height = element.ImageSize
|
||||||
else:
|
else:
|
||||||
width, height = photo.width(), photo.height()
|
width, height = photo.width(), photo.height()
|
||||||
tkbutton.config(image=photo, compound=tk.CENTER, width=width, height=height)
|
tkbutton.config(image=photo, compound=tk.CENTER, width=width, height=height)
|
||||||
|
|
Loading…
Reference in New Issue