cxykevin
/
magictk
2
3
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复plain的图标bug
Build and Publish / Run (push) Successful in 1m22s Details

This commit is contained in:
cxykevin 2024-04-29 21:10:39 +08:00
parent a7a4be2dab
commit 9d99df6d23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debug.py
View File

@ -73,6 +73,8 @@ if __name__ == "__main__":
func=lambda s: print("Icon Btn 1"), iconname="apple", iconsize=16, w=32).pack(side='left') func=lambda s: print("Icon Btn 1"), iconname="apple", iconsize=16, w=32).pack(side='left')
magictk.ButtonFill(frame4, color_type="primary", magictk.ButtonFill(frame4, color_type="primary",
func=lambda s: print("Icon Btn 2"), iconname="apple", iconsize=16, w=32).pack(side='left') func=lambda s: print("Icon Btn 2"), iconname="apple", iconsize=16, w=32).pack(side='left')
magictk.ButtonLight(frame4,
func=lambda s: print("Icon Btn 3"), iconname="apple", iconsize=16, w=32).pack(side='left')
frame4.pack() frame4.pack()
frame6 = magictk.Frame(win) frame6 = magictk.Frame(win)

8
magictk/button.py
View File

@ -305,11 +305,11 @@ class ButtonFill(Button):
py = y+x_n+1 py = y+x_n+1
lcolor = j lcolor = j
g_color = color_tmpl.mix_color( g_color = color_tmpl.mix_color(
"#FFFFFF", self.color[self._color_bd], int((1-lcolor/255)*1000)/1000) self._color_text, self.color[self._color_bd], int((1-lcolor/255)*1000)/1000)
f_color = color_tmpl.mix_color( f_color = color_tmpl.mix_color(
"#FFFFFF", self.color[self._color_fg1], int((1-lcolor/255)*1000)/1000) self._color_text, self.color[self._color_fg1], int((1-lcolor/255)*1000)/1000)
h_color = color_tmpl.mix_color( h_color = color_tmpl.mix_color(
"#FFFFFF", self.color[self._color_fg2], int((1-lcolor/255)*1000)/1000) self._color_text, self.color[self._color_fg2], int((1-lcolor/255)*1000)/1000)
obj = self.canvas.create_rectangle( obj = self.canvas.create_rectangle(
px, py, px, py, width=0, fill=g_color) px, py, px, py, width=0, fill=g_color)
@ -386,7 +386,7 @@ class ButtonFill(Button):
x_n += 1 x_n += 1
y_n += 1 y_n += 1
def __init__(self, master=None, root_anim=None, color_type="primary", w=80, h=30, text="Button", func=lambda s: print("Press"), color_list: dict = None, _dis_color=None, iconname="", iconsize=24): def __init__(self, master=None, root_anim=None, color_type="plain", w=80, h=30, text="Button", func=lambda s: print("Press"), color_list: dict = None, _dis_color=None, iconname="", iconsize=24):
if (_dis_color is None): if (_dis_color is None):
self._color_bd = color_type self._color_bd = color_type
self._color_bg = color_type self._color_bg = color_type

4
magictk/color_tmpl.py
View File

@ -27,6 +27,10 @@ default_color = {
"info_light3": "#B1B3B8", "info_light3": "#B1B3B8",
"info_dark": "#73767A", "info_dark": "#73767A",
"plain": "#606266", "plain": "#606266",
"plain_light": "#C6E2FF",
"plain_light2": "#ECF5FF",
"plain_light3": "#79BBFF",
"plain_dark": "#337ECC",
"primary_text": "#303133", "primary_text": "#303133",
"regular_text": "#606266", "regular_text": "#606266",
"secondary_text": "#909399", "secondary_text": "#909399",