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

Merge pull request #928 from MikeTheWatchGuy/Dev-latest 

Fix for accidental rename of  element to pane
This commit is contained in:
MikeTheWatchGuy 2018-12-14 17:21:26 -05:00 committed by GitHub
parent f8f7613aa9 c376e1b13a
commit 79bbbef368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
PySimpleGUI.py
View File

@ -4381,30 +4381,30 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
# ------------------------- COLUMN element ------------------------- # # ------------------------- COLUMN element ------------------------- #
if element_type == ELEM_TYPE_COLUMN: if element_type == ELEM_TYPE_COLUMN:
if element.Scrollable: if element.Scrollable:
pane.TKColFrame = TkScrollableFrame(tk_row_frame, element.VerticalScrollOnly) # do not use yet! not working element.TKColFrame = TkScrollableFrame(tk_row_frame, element.VerticalScrollOnly) # do not use yet! not working
PackFormIntoFrame(element, pane.TKColFrame.TKFrame, toplevel_form) PackFormIntoFrame(element, element.TKColFrame.TKFrame, toplevel_form)
pane.TKColFrame.TKFrame.update() element.TKColFrame.TKFrame.update()
if element.Size == (None, None): # if no size specified, use column width x column height/2 if element.Size == (None, None): # if no size specified, use column width x column height/2
pane.TKColFrame.canvas.config(width=pane.TKColFrame.TKFrame.winfo_reqwidth(), element.TKColFrame.canvas.config(width=element.TKColFrame.TKFrame.winfo_reqwidth(),
height=pane.TKColFrame.TKFrame.winfo_reqheight() / 2) height=element.TKColFrame.TKFrame.winfo_reqheight() / 2)
else: else:
pane.TKColFrame.canvas.config(width=element.Size[0], height=element.Size[1]) element.TKColFrame.canvas.config(width=element.Size[0], height=element.Size[1])
if not element.BackgroundColor in (None, COLOR_SYSTEM_DEFAULT): if not element.BackgroundColor in (None, COLOR_SYSTEM_DEFAULT):
pane.TKColFrame.canvas.config(background=element.BackgroundColor) element.TKColFrame.canvas.config(background=element.BackgroundColor)
pane.TKColFrame.TKFrame.config(background=element.BackgroundColor, borderwidth=0, element.TKColFrame.TKFrame.config(background=element.BackgroundColor, borderwidth=0,
highlightthickness=0) highlightthickness=0)
pane.TKColFrame.config(background=element.BackgroundColor, borderwidth=0, highlightthickness=0) element.TKColFrame.config(background=element.BackgroundColor, borderwidth=0, highlightthickness=0)
else: else:
pane.TKColFrame = tk.Frame(tk_row_frame) element.TKColFrame = tk.Frame(tk_row_frame)
PackFormIntoFrame(element, pane.TKColFrame, toplevel_form) PackFormIntoFrame(element, element.TKColFrame, toplevel_form)
pane.TKColFrame.pack(side=tk.LEFT, padx=elementpad[0], pady=elementpad[1], expand=True, fill='both') element.TKColFrame.pack(side=tk.LEFT, padx=elementpad[0], pady=elementpad[1], expand=True, fill='both')
if element.Visible is False: if element.Visible is False:
pane.TKColFrame.pack_forget() element.TKColFrame.pack_forget()
element.TKColFrame = pane.TKColFrame element.TKColFrame = element.TKColFrame
if element.BackgroundColor != COLOR_SYSTEM_DEFAULT and element.BackgroundColor is not None: if element.BackgroundColor != COLOR_SYSTEM_DEFAULT and element.BackgroundColor is not None:
pane.TKColFrame.configure(background=element.BackgroundColor, highlightbackground=element.BackgroundColor, element.TKColFrame.configure(background=element.BackgroundColor, highlightbackground=element.BackgroundColor,
highlightcolor=element.BackgroundColor) highlightcolor=element.BackgroundColor)
# ------------------------- Pane element ------------------------- # # ------------------------- Pane element ------------------------- #