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

Merge pull request #5429 from PySimpleGUI/Dev-latest 

Made selected colors match the theme for Input, Multiline Input and C…
This commit is contained in:
PySimpleGUI 2022-05-03 07:57:00 -04:00 committed by GitHub
parent 7de76115a4 235110403d
commit 153e0754c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.59.0.35 Released 5-Apr-2022" version = __version__ = "4.59.0.36 Released 5-Apr-2022"
_change_log = """ _change_log = """
Changelog since 4.59.0 released to PyPI on 5-Apr-2022 Changelog since 4.59.0 released to PyPI on 5-Apr-2022
@ -127,6 +127,8 @@ _change_log = """
Crashes because Elements don't have the method _is_window_created which was being called. YIKES! Crashes because Elements don't have the method _is_window_created which was being called. YIKES!
4.59.0.35 4.59.0.35
New coupon New coupon
4.59.0.36
Made selected text color for Input, Combo and Multiline match the color theme! (THANK YOU JASON!)
""" """
__version__ = version.split()[0] # For PEP 396 and PEP 345 __version__ = version.split()[0] # For PEP 396 and PEP 345
@ -15492,10 +15494,11 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
if element.ChangeSubmits: if element.ChangeSubmits:
element.TKEntry.bind('<Key>', element._KeyboardHandler) element.TKEntry.bind('<Key>', element._KeyboardHandler)
element.TKEntry.bind('<Return>', element._ReturnKeyHandler) element.TKEntry.bind('<Return>', element._ReturnKeyHandler)
if element.BackgroundColor is not None and element.BackgroundColor != COLOR_SYSTEM_DEFAULT: if element.BackgroundColor is not None and element.BackgroundColor != COLOR_SYSTEM_DEFAULT:
element.TKEntry.configure(background=element.BackgroundColor) element.TKEntry.configure(background=element.BackgroundColor, selectforeground=element.BackgroundColor)
if text_color is not None and text_color != COLOR_SYSTEM_DEFAULT: if text_color is not None and text_color != COLOR_SYSTEM_DEFAULT:
element.TKEntry.configure(fg=text_color) element.TKEntry.configure(fg=text_color, selectbackground=text_color)
if element.disabled_readonly_background_color is not None: if element.disabled_readonly_background_color is not None:
element.TKEntry.config(readonlybackground=element.disabled_readonly_background_color) element.TKEntry.config(readonlybackground=element.disabled_readonly_background_color)
@ -15549,10 +15552,10 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
try: try:
if element.TextColor not in (None, COLOR_SYSTEM_DEFAULT): if element.TextColor not in (None, COLOR_SYSTEM_DEFAULT):
combostyle.configure(style_name, foreground=element.TextColor) combostyle.configure(style_name, foreground=element.TextColor)
combostyle.configure(style_name, selectforeground=element.TextColor) combostyle.configure(style_name, selectbackground=element.TextColor)
combostyle.configure(style_name, insertcolor=element.TextColor) combostyle.configure(style_name, insertcolor=element.TextColor)
if element.BackgroundColor not in (None, COLOR_SYSTEM_DEFAULT): if element.BackgroundColor not in (None, COLOR_SYSTEM_DEFAULT):
combostyle.configure(style_name, selectbackground=element.BackgroundColor) combostyle.configure(style_name, selectforeground=element.BackgroundColor)
combostyle.map(style_name, fieldbackground=[('readonly', element.BackgroundColor)]) combostyle.map(style_name, fieldbackground=[('readonly', element.BackgroundColor)])
combostyle.configure(style_name, fieldbackground=element.BackgroundColor) combostyle.configure(style_name, fieldbackground=element.BackgroundColor)
@ -15764,7 +15767,7 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
element.TKText.insert(1.0, element.DefaultText) # set the default text element.TKText.insert(1.0, element.DefaultText) # set the default text
element.TKText.config(highlightthickness=0) element.TKText.config(highlightthickness=0)
if element.BackgroundColor is not None and element.BackgroundColor != COLOR_SYSTEM_DEFAULT: if element.BackgroundColor is not None and element.BackgroundColor != COLOR_SYSTEM_DEFAULT:
element.TKText.configure(background=element.BackgroundColor) element.TKText.configure(background=element.BackgroundColor, selectforeground=element.BackgroundColor)
element.TKText.tag_configure("center", justify='center') element.TKText.tag_configure("center", justify='center')
element.TKText.tag_configure("left", justify='left') element.TKText.tag_configure("left", justify='left')
@ -15801,7 +15804,9 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
toplevel_form.FocusSet = True toplevel_form.FocusSet = True
element.TKText.focus_set() element.TKText.focus_set()
if text_color is not None and text_color != COLOR_SYSTEM_DEFAULT: if text_color is not None and text_color != COLOR_SYSTEM_DEFAULT:
element.TKText.configure(fg=text_color) element.TKText.configure(fg=text_color, selectbackground=text_color)
if element.Disabled is True: if element.Disabled is True:
element.TKText['state'] = 'disabled' element.TKText['state'] = 'disabled'
if element.Tooltip is not None: if element.Tooltip is not None: