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

Set ButtonMenu font for menus to be same as the button font

This commit is contained in:
PySimpleGUI 2020-05-25 06:29:37 -04:00
parent a95fccad69
commit a511bb8688
1 changed files with 56 additions and 114 deletions

170
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.19.0.9 Unreleased - Window.set_title added, removed resetting stdout when flush happens, fixed MenuBar tearoff not working, fixed get folder for Macs, fixed multiline color problem, option to set tooltip font, make typing module import optional, docstring, combobox drop-down portion font change, ability to have multiple progress bar themes at one time, setting radio button to False will clear entire group, added changing title to Tab update" version = __version__ = "4.19.0.10 Unreleased - Window.set_title added, removed resetting stdout when flush happens, fixed MenuBar tearoff not working, fixed get folder for Macs, fixed multiline color problem, option to set tooltip font, make typing module import optional, docstring, combobox drop-down portion font change, ability to have multiple progress bar themes at one time, setting radio button to False will clear entire group, added changing title to Tab update, ButtonMenu - font for menu set to same as button"
port = 'PySimpleGUI' port = 'PySimpleGUI'
@ -9510,123 +9510,65 @@ def _FindElementWithFocusInSubForm(form):
return None return None
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): """
""" Only to be used internally. Not user callable
Only to be used internally. Not user callable :param top_menu: ???
:param top_menu: ??? :param sub_menu_info: ???
:param sub_menu_info: ??? :param element: ???
:param element: ??? :param is_sub_menu: (Default = False)
:param is_sub_menu: (Default = False) :param skip: (Default = False)
:param skip: (Default = False)
""" """
return_val = None return_val = None
if type(sub_menu_info) is str: if type(sub_menu_info) is str:
if not is_sub_menu and not skip: if not is_sub_menu and not skip:
# print(f'Adding command {sub_menu_info}') pos = sub_menu_info.find('&')
pos = sub_menu_info.find('&') if pos != -1:
if pos != -1: if pos == 0 or sub_menu_info[pos - 1] != "\\":
if pos == 0 or sub_menu_info[pos - 1] != "\\": sub_menu_info = sub_menu_info[:pos] + sub_menu_info[pos + 1:]
sub_menu_info = sub_menu_info[:pos] + sub_menu_info[pos + 1:] if sub_menu_info == '---':
if sub_menu_info == '---': top_menu.add('separator')
top_menu.add('separator') else:
try:
item_without_key = sub_menu_info[:sub_menu_info.index(MENU_KEY_SEPARATOR)]
except:
item_without_key = sub_menu_info
if item_without_key[0] == MENU_DISABLED_CHARACTER:
top_menu.add_command(label=item_without_key[len(MENU_DISABLED_CHARACTER):], underline=pos,
command=lambda: element._MenuItemChosenCallback(sub_menu_info))
top_menu.entryconfig(item_without_key[len(MENU_DISABLED_CHARACTER):], state='disabled')
else: else:
try: top_menu.add_command(label=item_without_key, underline=pos,
item_without_key = sub_menu_info[:sub_menu_info.index(MENU_KEY_SEPARATOR)] command=lambda: element._MenuItemChosenCallback(sub_menu_info))
except: else:
item_without_key = sub_menu_info i = 0
while i < (len(sub_menu_info)):
if item_without_key[0] == MENU_DISABLED_CHARACTER: item = sub_menu_info[i]
top_menu.add_command(label=item_without_key[len(MENU_DISABLED_CHARACTER):], underline=pos, if i != len(sub_menu_info) - 1:
command=lambda: element._MenuItemChosenCallback(sub_menu_info)) if type(sub_menu_info[i + 1]) == list:
top_menu.entryconfig(item_without_key[len(MENU_DISABLED_CHARACTER):], state='disabled') new_menu = tk.Menu(top_menu, tearoff=element.Tearoff)
if element.Font is not None:
new_menu.config(font=element.Font)
return_val = new_menu
pos = sub_menu_info[i].find('&')
if pos != -1:
if pos == 0 or sub_menu_info[i][pos - 1] != "\\":
sub_menu_info[i] = sub_menu_info[i][:pos] + sub_menu_info[i][pos + 1:]
if sub_menu_info[i][0] == MENU_DISABLED_CHARACTER:
top_menu.add_cascade(label=sub_menu_info[i][len(MENU_DISABLED_CHARACTER):], menu=new_menu,
underline=pos, state='disabled')
else: else:
top_menu.add_command(label=item_without_key, underline=pos, top_menu.add_cascade(label=sub_menu_info[i], menu=new_menu, underline=pos)
command=lambda: element._MenuItemChosenCallback(sub_menu_info)) AddMenuItem(new_menu, sub_menu_info[i + 1], element, is_sub_menu=True)
else: i += 1 # skip the next one
i = 0
while i < (len(sub_menu_info)):
item = sub_menu_info[i]
if i != len(sub_menu_info) - 1:
if type(sub_menu_info[i + 1]) == list:
new_menu = tk.Menu(top_menu, tearoff=element.Tearoff)
if element.Font is not None:
new_menu.config(font=element.Font)
return_val = new_menu
pos = sub_menu_info[i].find('&')
if pos != -1:
if pos == 0 or sub_menu_info[i][pos - 1] != "\\":
sub_menu_info[i] = sub_menu_info[i][:pos] + sub_menu_info[i][pos + 1:]
if sub_menu_info[i][0] == MENU_DISABLED_CHARACTER:
top_menu.add_cascade(label=sub_menu_info[i][len(MENU_DISABLED_CHARACTER):], menu=new_menu,
underline=pos, state='disabled')
else:
top_menu.add_cascade(label=sub_menu_info[i], menu=new_menu, underline=pos)
AddMenuItem(new_menu, sub_menu_info[i + 1], element, is_sub_menu=True)
i += 1 # skip the next one
else:
AddMenuItem(top_menu, item, element)
else: else:
AddMenuItem(top_menu, item, element) AddMenuItem(top_menu, item, element)
i += 1 else:
return return_val AddMenuItem(top_menu, item, element)
else: i += 1
def AddMenuItem(top_menu, sub_menu_info, element, is_sub_menu=False, skip=False): return return_val
"""
:param top_menu: ???
:param sub_menu_info: ???
:param element: ???
:param is_sub_menu: (Default = False)
:param skip: (Default = False)
"""
if not isinstance(sub_menu_info, list):
if not is_sub_menu and not skip:
# print(f'Adding command {sub_menu_info}')
pos = sub_menu_info.find('&')
if pos != -1:
if pos == 0 or sub_menu_info[pos - 1] != "\\":
sub_menu_info = sub_menu_info[:pos] + sub_menu_info[pos + 1:]
if sub_menu_info == '---':
top_menu.add('separator')
else:
try:
item_without_key = sub_menu_info[:sub_menu_info.index(MENU_KEY_SEPARATOR)]
except:
item_without_key = sub_menu_info
if item_without_key[0] == MENU_DISABLED_CHARACTER:
top_menu.add_command(label=item_without_key[len(MENU_DISABLED_CHARACTER):], underline=pos,
command=lambda: element._MenuItemChosenCallback(sub_menu_info))
top_menu.entryconfig(item_without_key[len(MENU_DISABLED_CHARACTER):], state='disabled')
else:
top_menu.add_command(label=item_without_key, underline=pos,
command=lambda: element._MenuItemChosenCallback(sub_menu_info))
else:
i = 0
while i < (len(sub_menu_info)):
item = sub_menu_info[i]
if i != len(sub_menu_info) - 1:
if isinstance(sub_menu_info[i + 1], list):
new_menu = tk.Menu(top_menu, tearoff=element.Tearoff)
pos = sub_menu_info[i].find('&')
if pos != -1:
if pos == 0 or sub_menu_info[i][pos - 1] != "\\":
sub_menu_info[i] = sub_menu_info[i][:pos] + sub_menu_info[i][pos + 1:]
if sub_menu_info[i][0] == MENU_DISABLED_CHARACTER:
top_menu.add_cascade(label=sub_menu_info[i][len(MENU_DISABLED_CHARACTER):], menu=new_menu,
underline=pos, state='disabled')
else:
top_menu.add_cascade(label=sub_menu_info[i], menu=new_menu, underline=pos)
AddMenuItem(new_menu, sub_menu_info[i + 1], element, is_sub_menu=True)
i += 1 # skip the next one
else:
AddMenuItem(top_menu, item, element)
else:
AddMenuItem(top_menu, item, element)
i += 1
# 888 888 d8b 888 # 888 888 d8b 888
# 888 888 Y8P 888 # 888 888 Y8P 888
@ -10201,7 +10143,7 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
menu_def = element.MenuDefinition menu_def = element.MenuDefinition
top_menu = tk.Menu(tkbutton, tearoff=False) top_menu = tk.Menu(tkbutton, tearoff=False, font=font)
AddMenuItem(top_menu, menu_def[1], element) AddMenuItem(top_menu, menu_def[1], element)
tkbutton.configure(menu=top_menu) tkbutton.configure(menu=top_menu)