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

Merge pull request #1857 from PySimpleGUI/Dev-latest 

Dev latest
This commit is contained in:
MikeTheWatchGuy 2019-08-21 23:16:55 -04:00 committed by GitHub
parent 0e1a079255 c63ecbfd08
commit 0c151b464f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PySimpleGUI.py
View File

@ -1071,7 +1071,7 @@ class Listbox(Element):
when a window.Read() is executed. when a window.Read() is executed.
""" """
def __init__(self, values, default_values=None, select_mode=None, change_submits=False, enable_events=False, def __init__(self, values, default_values=None, select_mode=None, change_submits=False, enable_events=False,
bind_return_key=False, size=(None, None), disabled=False, auto_size_text=None, font=None, bind_return_key=False, size=(None, None), disabled=False, auto_size_text=None, font=None, no_scrollbar=False,
background_color=None, text_color=None, key=None, pad=None, tooltip=None, right_click_menu=None, background_color=None, text_color=None, key=None, pad=None, tooltip=None, right_click_menu=None,
visible=True): visible=True):
""" """
@ -1118,6 +1118,7 @@ class Listbox(Element):
self.RightClickMenu = right_click_menu self.RightClickMenu = right_click_menu
self.vsb = None # type: tk.Scrollbar self.vsb = None # type: tk.Scrollbar
self.TKListbox = self.Widget = None # type: tk.Listbox self.TKListbox = self.Widget = None # type: tk.Listbox
self.NoScrollbar = no_scrollbar
super().__init__(ELEM_TYPE_INPUT_LISTBOX, size=size, auto_size_text=auto_size_text, font=font, super().__init__(ELEM_TYPE_INPUT_LISTBOX, size=size, auto_size_text=auto_size_text, font=font,
background_color=bg, text_color=fg, key=key, pad=pad, tooltip=tooltip, visible=visible) background_color=bg, text_color=fg, key=key, pad=pad, tooltip=tooltip, visible=visible)
@ -1158,10 +1159,12 @@ class Listbox(Element):
warnings.warn('* Listbox Update selection_set failed with index {}*'.format(set_to_index)) warnings.warn('* Listbox Update selection_set failed with index {}*'.format(set_to_index))
if visible is False: if visible is False:
self.TKListbox.pack_forget() self.TKListbox.pack_forget()
self.vsb.pack_forget() if not self.NoScrollbar:
self.vsb.pack_forget()
elif visible is True: elif visible is True:
self.TKListbox.pack() self.TKListbox.pack()
self.vsb.pack() if not self.NoScrollbar:
self.vsb.pack()
if scroll_to_index is not None and len(self.Values): if scroll_to_index is not None and len(self.Values):
self.TKListbox.yview_moveto(scroll_to_index/len(self.Values)) self.TKListbox.yview_moveto(scroll_to_index/len(self.Values))
@ -7754,11 +7757,12 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
element.TKListbox.configure(fg=text_color) element.TKListbox.configure(fg=text_color)
if element.ChangeSubmits: if element.ChangeSubmits:
element.TKListbox.bind('<<ListboxSelect>>', element._ListboxSelectHandler) element.TKListbox.bind('<<ListboxSelect>>', element._ListboxSelectHandler)
element.vsb = tk.Scrollbar(listbox_frame, orient="vertical", command=element.TKListbox.yview) if not element.NoScrollbar:
element.TKListbox.configure(yscrollcommand=element.vsb.set) element.vsb = tk.Scrollbar(listbox_frame, orient="vertical", command=element.TKListbox.yview)
element.TKListbox.pack(side=tk.LEFT) element.TKListbox.configure(yscrollcommand=element.vsb.set)
element.vsb.pack(side=tk.LEFT, fill='y') element.vsb.pack(side=tk.RIGHT, fill='y')
listbox_frame.pack(side=tk.LEFT, padx=elementpad[0], pady=elementpad[1]) listbox_frame.pack(side=tk.LEFT, padx=elementpad[0], pady=elementpad[1])
element.TKListbox.pack(side=tk.LEFT)
if element.Visible is False: if element.Visible is False:
listbox_frame.pack_forget() listbox_frame.pack_forget()
element.vsb.pack_forget() element.vsb.pack_forget()
@ -11042,7 +11046,7 @@ def main():
] ]
frame2 = [ frame2 = [
[Listbox(['Listbox 1', 'Listbox 2', 'Listbox 3'], select_mode=SELECT_MODE_EXTENDED, size=(20, 5))], [Listbox(['Listbox 1', 'Listbox 2', 'Listbox 3'], select_mode=SELECT_MODE_EXTENDED, size=(20, 5), no_scrollbar=True)],
[Combo(['Combo item 1',2,3,4 ], size=(20, 3),readonly=True, text_color='red', background_color='red', key='_COMBO1_')], [Combo(['Combo item 1',2,3,4 ], size=(20, 3),readonly=True, text_color='red', background_color='red', key='_COMBO1_')],
# [Combo(['Combo item 1', 2,3,4], size=(20, 3), readonly=False, text_color='red', background_color='red', key='_COMBO2_')], # [Combo(['Combo item 1', 2,3,4], size=(20, 3), readonly=False, text_color='red', background_color='red', key='_COMBO2_')],
[Spin([1, 2, 3, 'a','b','c'], size=(4, 3))], [Spin([1, 2, 3, 'a','b','c'], size=(4, 3))],

2
PySimpleGUI27.py
View File

@ -12,7 +12,7 @@ from builtins import str
from builtins import object from builtins import object
from future import standard_library from future import standard_library
standard_library.install_aliases() standard_library.install_aliases()
version = __version__ = "2.3.0.0 Unreleased" version = __version__ = "2.2.1 Released - Patched"
# 888888ba .d88888b oo dP .88888. dP dP dP # 888888ba .d88888b oo dP .88888. dP dP dP