Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions customtkinter/widgets/ctk_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ def __init__(self, *args,
**kwargs):

# transfer basic functionality (bg_color, size, _appearance_mode, scaling) to CTkBaseClass
if "master" in kwargs:
super().__init__(*args, bg_color=bg_color, width=width, height=height, master=kwargs.pop("master"))
else:
super().__init__(*args, bg_color=bg_color, width=width, height=height)
super_kwargs = {}
if "master" in kwargs:
super_kwargs['master'] = kwargs.pop("master")
if "name" in kwargs:
super_kwargs['name'] = kwargs.pop("name")
super().__init__(*args, bg_color=bg_color, width=width, height=height,**super_kwargs)

# configure grid system (1x1)
self.grid_rowconfigure(0, weight=1)
Expand Down
11 changes: 6 additions & 5 deletions customtkinter/widgets/ctk_label.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ def __init__(self, *args,
**kwargs):

# transfer basic functionality (bg_color, size, _appearance_mode, scaling) to CTkBaseClass
if "master" in kwargs:
super().__init__(*args, bg_color=bg_color, width=width, height=height, master=kwargs.pop("master"))
else:
super().__init__(*args, bg_color=bg_color, width=width, height=height)

super_kwargs = {}
if "master" in kwargs:
super_kwargs['master'] = kwargs.pop("master")
if "name" in kwargs:
super_kwargs['name'] = kwargs.pop("name")
super().__init__(*args, bg_color=bg_color, width=width, height=height,**super_kwargs)
# color
self.fg_color = ThemeManager.theme["color"]["label"] if fg_color == "default_theme" else fg_color
if self.fg_color is None:
Expand Down
12 changes: 7 additions & 5 deletions customtkinter/widgets/ctk_textbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ def __init__(self, *args,
**kwargs):

# transfer basic functionality (bg_color, size, _appearance_mode, scaling) to CTkBaseClass
if "master" in kwargs:
super().__init__(*args, bg_color=bg_color, width=width, height=height, master=kwargs.pop("master"))
else:
super().__init__(*args, bg_color=bg_color, width=width, height=height)
super_kwargs = {}
if "master" in kwargs:
super_kwargs['master'] = kwargs.pop("master")
if "name" in kwargs:
super_kwargs['name'] = kwargs.pop("name")
super().__init__(*args, bg_color=bg_color, width=width, height=height,**super_kwargs)

# color
self.fg_color = ThemeManager.theme["color"]["entry"] if fg_color == "default_theme" else fg_color
Expand Down Expand Up @@ -166,4 +168,4 @@ def configure(self, require_redraw=False, **kwargs):
else:
super().configure(require_redraw=require_redraw)

self.textbox.configure(**kwargs)
self.textbox.configure(**kwargs)