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

Fix for popups not closing on Linux. Switched away from CloseButtons

This commit is contained in:
PySimpleGUI 2019-12-12 19:01:45 -05:00
parent 78116aa9f7
commit fad8e6bea6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.11.0.1 Unreleased - ability to set the disabled text color for tk.Buttons" version = __version__ = "4.11.0.2 Unreleased - ability to set the disabled text color for tk.Buttons, popup no more closebutton use"
port = 'PySimpleGUI' port = 'PySimpleGUI'
@ -11042,7 +11042,7 @@ def Popup(*args, title=None, button_color=None, background_color=None, text_colo
if non_blocking: if non_blocking:
PopupButton = DummyButton # important to use or else button will close other windows too! PopupButton = DummyButton # important to use or else button will close other windows too!
else: else:
PopupButton = CloseButton PopupButton = Button
# show either an OK or Yes/No depending on paramater # show either an OK or Yes/No depending on paramater
if custom_text != (None, None): if custom_text != (None, None):
if type(custom_text) is not tuple: if type(custom_text) is not tuple:
@ -11078,6 +11078,7 @@ def Popup(*args, title=None, button_color=None, background_color=None, text_colo
button, values = window.Read(timeout=0) button, values = window.Read(timeout=0)
else: else:
button, values = window.Read() button, values = window.Read()
window.close()
return button return button
@ -11141,7 +11142,7 @@ def PopupScrolled(*args, title=None, button_color=None, background_color=None,
window.AddRow(Multiline(complete_output, size=(max_line_width, height_computed), background_color=background_color, text_color=text_color)) window.AddRow(Multiline(complete_output, size=(max_line_width, height_computed), background_color=background_color, text_color=text_color))
pad = max_line_total - 15 if max_line_total > 15 else 1 pad = max_line_total - 15 if max_line_total > 15 else 1
# show either an OK or Yes/No depending on paramater # show either an OK or Yes/No depending on paramater
button = DummyButton if non_blocking else CloseButton button = DummyButton if non_blocking else Button
if yes_no: if yes_no:
window.AddRow(Text('', size=(pad, 1), auto_size_text=False, background_color=background_color), button('Yes'), button('No')) window.AddRow(Text('', size=(pad, 1), auto_size_text=False, background_color=background_color), button('Yes'), button('No'))
else: else:
@ -11152,7 +11153,7 @@ def PopupScrolled(*args, title=None, button_color=None, background_color=None,
button, values = window.Read(timeout=0) button, values = window.Read(timeout=0)
else: else:
button, values = window.Read() button, values = window.Read()
# window.Close() window.close()
return button return button