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

Merge pull request #1293 from PySimpleGUI/Dev-latest 

Added Buttons being detected in FindElementWithFocus
This commit is contained in:
MikeTheWatchGuy 2019-04-06 09:14:31 -04:00 committed by GitHub
parent ed3c788ab3 910f0eaf15
commit 92b25c2289
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PySimpleGUI.py
View File

@ -1481,7 +1481,7 @@ class Button(Element):
self.FileTypes = file_types self.FileTypes = file_types
self.TKButton = None self.TKButton = None
self.Target = target self.Target = target
self.ButtonText = button_text self.ButtonText = str(button_text)
if sys.platform == 'darwin' and button_color is not None: if sys.platform == 'darwin' and button_color is not None:
print('Button *** WARNING - Button colors are not supported on the Mac ***') print('Button *** WARNING - Button colors are not supported on the Mac ***')
self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR self.ButtonColor = button_color if button_color else DEFAULT_BUTTON_COLOR
@ -4690,6 +4690,10 @@ def _FindElementWithFocusInSubForm(form):
if element.TKText is not None: if element.TKText is not None:
if element.TKText is element.TKText.focus_get(): if element.TKText is element.TKText.focus_get():
return element return element
if element.Type == ELEM_TYPE_BUTTON:
if element.TKButton is not None:
if element.TKButton is element.TKButton.focus_get():
return element
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
def AddMenuItem(top_menu, sub_menu_info, element, is_sub_menu=False, skip=False): def AddMenuItem(top_menu, sub_menu_info, element, is_sub_menu=False, skip=False):
@ -5992,6 +5996,7 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
def ConvertFlexToTK(MyFlexForm): def ConvertFlexToTK(MyFlexForm):
MyFlexForm # type: Window
master = MyFlexForm.TKroot master = MyFlexForm.TKroot
master.title(MyFlexForm.Title) master.title(MyFlexForm.Title)
InitializeResults(MyFlexForm) InitializeResults(MyFlexForm)