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

font support for Multiline and Combobox Elements. Removing internal use of ReadNonBlocking call.

This commit is contained in:
MikeTheWatchGuy 2018-10-31 17:59:39 -04:00
parent ef324f63d6
commit 11ec70ed77
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PySimpleGUI.py
View File

@ -524,7 +524,7 @@ Input = InputText
class InputCombo(Element): class InputCombo(Element):
def __init__(self, values, default_value=None, size=(None, None), auto_size_text=None, background_color=None, def __init__(self, values, default_value=None, size=(None, None), auto_size_text=None, background_color=None,
text_color=None, change_submits=False, disabled=False, key=None, pad=None, tooltip=None, text_color=None, change_submits=False, disabled=False, key=None, pad=None, tooltip=None,
readonly=False): readonly=False, font=None):
''' '''
Input Combo Box Element (also called Dropdown box) Input Combo Box Element (also called Dropdown box)
:param values: :param values:
@ -543,9 +543,9 @@ class InputCombo(Element):
fg = text_color if text_color is not None else DEFAULT_INPUT_TEXT_COLOR fg = text_color if text_color is not None else DEFAULT_INPUT_TEXT_COLOR
super().__init__(ELEM_TYPE_INPUT_COMBO, size=size, auto_size_text=auto_size_text, background_color=bg, super().__init__(ELEM_TYPE_INPUT_COMBO, size=size, auto_size_text=auto_size_text, background_color=bg,
text_color=fg, key=key, pad=pad, tooltip=tooltip) text_color=fg, key=key, pad=pad, tooltip=tooltip, font=font or DEFAULT_FONT)
def Update(self, value=None, values=None, set_to_index=None, disabled=None, readonly=None): def Update(self, value=None, values=None, set_to_index=None, disabled=None, readonly=None, font=None):
if values is not None: if values is not None:
try: try:
self.TKCombo['values'] = values self.TKCombo['values'] = values
@ -576,6 +576,8 @@ class InputCombo(Element):
self.Readonly = readonly self.Readonly = readonly
if self.Readonly: if self.Readonly:
self.TKCombo['state'] = 'readonly' self.TKCombo['state'] = 'readonly'
if font is not None:
self.TKText.configure(font=font)
def __del__(self): def __del__(self):
try: try:
@ -920,7 +922,7 @@ class Spin(Element):
class Multiline(Element): class Multiline(Element):
def __init__(self, default_text='', enter_submits=False, disabled=False, autoscroll=False, size=(None, None), def __init__(self, default_text='', enter_submits=False, disabled=False, autoscroll=False, size=(None, None),
auto_size_text=None, background_color=None, text_color=None, change_submits=False, do_not_clear=False, key=None, focus=False, auto_size_text=None, background_color=None, text_color=None, change_submits=False, do_not_clear=False, key=None, focus=False,
pad=None, tooltip=None): font=None, pad=None, tooltip=None):
''' '''
Multiline Element Multiline Element
:param default_text: :param default_text:
@ -936,6 +938,7 @@ class Multiline(Element):
:param focus: :param focus:
:param pad: :param pad:
:param tooltip: :param tooltip:
:param font:
''' '''
self.DefaultText = default_text self.DefaultText = default_text
self.EnterSubmits = enter_submits self.EnterSubmits = enter_submits
@ -946,12 +949,13 @@ class Multiline(Element):
self.Autoscroll = autoscroll self.Autoscroll = autoscroll
self.Disabled = disabled self.Disabled = disabled
self.ChangeSubmits = change_submits self.ChangeSubmits = change_submits
print(font or DEFAULT_FONT)
super().__init__(ELEM_TYPE_INPUT_MULTILINE, size=size, auto_size_text=auto_size_text, background_color=bg, super().__init__(ELEM_TYPE_INPUT_MULTILINE, size=size, auto_size_text=auto_size_text, background_color=bg,
text_color=fg, key=key, pad=pad, tooltip=tooltip) text_color=fg, key=key, pad=pad, tooltip=tooltip, font=font or DEFAULT_FONT)
return return
def Update(self, value=None, disabled=None, append=False): def Update(self, value=None, disabled=None, append=False, font=None):
if value is not None: if value is not None:
try: try:
if not append: if not append:
@ -966,6 +970,8 @@ class Multiline(Element):
self.TKText.configure(state='disabled') self.TKText.configure(state='disabled')
elif disabled == False: elif disabled == False:
self.TKText.configure(state='normal') self.TKText.configure(state='normal')
if font is not None:
self.TKText.configure(font=font)
def Get(self): def Get(self):
return self.TKText.get(1.0, tk.END) return self.TKText.get(1.0, tk.END)
@ -5060,7 +5066,7 @@ class DebugWin():
# print(1, 2, 3, sep='-') # print(1, 2, 3, sep='-')
# if end is None: # if end is None:
# print("") # print("")
self.form.ReadNonBlocking() self.form.Read(timeout=0)
def Close(self): def Close(self):
self.form.CloseNonBlockingForm() self.form.CloseNonBlockingForm()
@ -5739,7 +5745,7 @@ def Popup(*args, button_color=None, background_color=None, text_color=None, butt
pad=((20, 0), 3))) pad=((20, 0), 3)))
if non_blocking: if non_blocking:
button, values = window.ReadNonBlocking() button, values = window.Read(timeout=0)
else: else:
button, values = window.Read() button, values = window.Read()