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

Merge pull request #3623 from PySimpleGUI/Dev-latest 

Check for COLOR_SYSTEM_DEFAULT in Button.update
This commit is contained in:
PySimpleGUI 2020-11-15 18:57:02 -05:00 committed by GitHub
parent 8dd4d2a61b 80cfdbcf3d
commit 89aadb5572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PySimpleGUI.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
from wx import Font from wx import Font
version = __version__ = "4.31.0.1 Unreleased\nChange Menu & ButtonMenu color and font default, renamed & refactored from FlexForm to Window in ConvertFlexToTK" version = __version__ = "4.31.0.2 Unreleased\nChange Menu & ButtonMenu color and font default, renamed & refactored from FlexForm to Window in ConvertFlexToTK, Button.update now checks for COLOR_SYSTEM_DEFAULT"
__version__ = version.split()[0] # For PEP 396 and PEP 345 __version__ = version.split()[0] # For PEP 396 and PEP 345
@ -3509,7 +3509,7 @@ class Button(Element):
if text is not None: if text is not None:
self.TKButton.configure(text=text) self.TKButton.configure(text=text)
self.ButtonText = text self.ButtonText = text
if button_color != (None, None): if button_color != (None, None) and button_color != COLOR_SYSTEM_DEFAULT:
if isinstance(button_color, str): if isinstance(button_color, str):
try: try:
button_color = button_color.split(' on ') button_color = button_color.split(' on ')
@ -3561,7 +3561,7 @@ class Button(Element):
self.TKButton.pack_forget() self.TKButton.pack_forget()
elif visible is True: elif visible is True:
self.TKButton.pack(padx=self.pad_used[0], pady=self.pad_used[1]) self.TKButton.pack(padx=self.pad_used[0], pady=self.pad_used[1])
if disabled_button_color != (None, None): if disabled_button_color != (None, None) and disabled_button_color != COLOR_SYSTEM_DEFAULT:
if not self.UseTtkButtons: if not self.UseTtkButtons:
self.TKButton['disabledforeground'] = disabled_button_color[0] self.TKButton['disabledforeground'] = disabled_button_color[0]
else: else: