afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Huy Pham 2020-01-15 15:27:33 -08:00
commit 5c087141bd
86 changed files with 3313 additions and 1832 deletions
Download patch file Download diff file Expand all files Collapse all files

10
daemon/core/gui/themes.py
View file

@ -33,7 +33,7 @@ class Colors:
listboxbg = "#f2f1f0"
def load(style):
def load(style: ttk.Style):
style.theme_create(
THEME_DARK,
"clam",
@ -139,13 +139,13 @@ def load(style):
)
def theme_change_menu(event):
def theme_change_menu(event: tk.Event):
if not isinstance(event.widget, tk.Menu):
return
style_menu(event.widget)
def style_menu(widget):
def style_menu(widget: tk.Widget):
style = ttk.Style()
bg = style.lookup(".", "background")
fg = style.lookup(".", "foreground")
@ -157,7 +157,7 @@ def style_menu(widget):
)
def style_listbox(widget):
def style_listbox(widget: tk.Widget):
style = ttk.Style()
bg = style.lookup(".", "background")
fg = style.lookup(".", "foreground")
@ -174,7 +174,7 @@ def style_listbox(widget):
)
def theme_change(event):
def theme_change(event: tk.Event):
style = ttk.Style()
style.configure(Styles.picker_button, font=("TkDefaultFont", 8, "normal"))
style.configure(