mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2434 from PySimpleGUI/Dev-latest 

Back out the row padding change.  Fixed crash in set_icon
This commit is contained in:
PySimpleGUI 2019-12-25 18:29:08 -05:00 committed by GitHub
parent c845b4292e 351bcfa170
commit 69eb845eb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PySimpleGUI.py
View File

@ -5666,9 +5666,9 @@ class Window:
self.WindowIcon = wicon self.WindowIcon = wicon
return return
wicon = icon
try: try:
self.TKroot.iconbitmap(icon) self.TKroot.iconbitmap(icon)
wicon = icon
except: except:
try: try:
wicon = tkinter.PhotoImage(file=icon) wicon = tkinter.PhotoImage(file=icon)
@ -9272,7 +9272,8 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
# row_should_expand = False # row_should_expand = False
tk_row_frame.pack(side=tk.TOP, anchor=anchor, expand=row_should_expand, fill=tk.BOTH if row_should_expand else tk.NONE) tk_row_frame.pack(side=tk.TOP, anchor=anchor, padx=toplevel_form.Margins[0],
expand=row_should_expand, fill=tk.BOTH if row_should_expand else tk.NONE)
if form.BackgroundColor is not None and form.BackgroundColor != COLOR_SYSTEM_DEFAULT: if form.BackgroundColor is not None and form.BackgroundColor != COLOR_SYSTEM_DEFAULT:
tk_row_frame.configure(background=form.BackgroundColor) tk_row_frame.configure(background=form.BackgroundColor)
toplevel_form.TKroot.configure(padx=toplevel_form.Margins[0], pady=toplevel_form.Margins[1]) toplevel_form.TKroot.configure(padx=toplevel_form.Margins[0], pady=toplevel_form.Margins[1])