mirror of
https://github.com/TomSchimansky/CustomTkinter.git
synced 2023-08-10 21:13:13 +03:00
Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
8fc2d31584 | |||
290cafbc39 | |||
9bd6d7bdde | |||
6841f94a99 | |||
a0c0da6c9a | |||
10d5cd4c2a | |||
abe33f7e81 | |||
37b375d58b | |||
cd85a1c782 | |||
1960c0b1e0 | |||
6d2f31c23c | |||
c6b16ce815 | |||
9f653fab1d |
@ -56,7 +56,6 @@ The **official** documentation can be found here:
|
|||||||
## Example Program
|
## Example Program
|
||||||
To test customtkinter you can try this simple example with only a single button:
|
To test customtkinter you can try this simple example with only a single button:
|
||||||
```python
|
```python
|
||||||
import tkinter
|
|
||||||
import customtkinter
|
import customtkinter
|
||||||
|
|
||||||
customtkinter.set_appearance_mode("System") # Modes: system (default), light, dark
|
customtkinter.set_appearance_mode("System") # Modes: system (default), light, dark
|
||||||
@ -70,7 +69,7 @@ def button_function():
|
|||||||
|
|
||||||
# Use CTkButton instead of tkinter Button
|
# Use CTkButton instead of tkinter Button
|
||||||
button = customtkinter.CTkButton(master=app, text="CTkButton", command=button_function)
|
button = customtkinter.CTkButton(master=app, text="CTkButton", command=button_function)
|
||||||
button.place(relx=0.5, rely=0.5, anchor=tkinter.CENTER)
|
button.place(relx=0.5, rely=0.5, anchor=customtkinter.CENTER)
|
||||||
|
|
||||||
app.mainloop()
|
app.mainloop()
|
||||||
```
|
```
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
__version__ = "5.1.3"
|
__version__ = "5.2.0"
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
"text_color":["gray10", "#DCE4EE"],
|
"text_color":["gray10", "#DCE4EE"],
|
||||||
"placeholder_text_color": ["gray52", "gray62"]
|
"placeholder_text_color": ["gray52", "gray62"]
|
||||||
},
|
},
|
||||||
"CTkCheckbox": {
|
"CTkCheckBox": {
|
||||||
"corner_radius": 6,
|
"corner_radius": 6,
|
||||||
"border_width": 3,
|
"border_width": 3,
|
||||||
"fg_color": ["#3B8ED0", "#1F6AA5"],
|
"fg_color": ["#3B8ED0", "#1F6AA5"],
|
||||||
@ -55,7 +55,7 @@
|
|||||||
"text_color": ["gray10", "#DCE4EE"],
|
"text_color": ["gray10", "#DCE4EE"],
|
||||||
"text_color_disabled": ["gray60", "gray45"]
|
"text_color_disabled": ["gray60", "gray45"]
|
||||||
},
|
},
|
||||||
"CTkRadiobutton": {
|
"CTkRadioButton": {
|
||||||
"corner_radius": 1000,
|
"corner_radius": 1000,
|
||||||
"border_width_checked": 6,
|
"border_width_checked": 6,
|
||||||
"border_width_unchecked": 3,
|
"border_width_unchecked": 3,
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
"text_color": ["gray14", "gray84"],
|
"text_color": ["gray14", "gray84"],
|
||||||
"placeholder_text_color": ["gray52", "gray62"]
|
"placeholder_text_color": ["gray52", "gray62"]
|
||||||
},
|
},
|
||||||
"CTkCheckbox": {
|
"CTkCheckBox": {
|
||||||
"corner_radius": 6,
|
"corner_radius": 6,
|
||||||
"border_width": 3,
|
"border_width": 3,
|
||||||
"fg_color": ["#3a7ebf", "#1f538d"],
|
"fg_color": ["#3a7ebf", "#1f538d"],
|
||||||
@ -55,7 +55,7 @@
|
|||||||
"text_color": ["gray14", "gray84"],
|
"text_color": ["gray14", "gray84"],
|
||||||
"text_color_disabled": ["gray60", "gray45"]
|
"text_color_disabled": ["gray60", "gray45"]
|
||||||
},
|
},
|
||||||
"CTkRadiobutton": {
|
"CTkRadioButton": {
|
||||||
"corner_radius": 1000,
|
"corner_radius": 1000,
|
||||||
"border_width_checked": 6,
|
"border_width_checked": 6,
|
||||||
"border_width_unchecked": 3,
|
"border_width_unchecked": 3,
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
"text_color":["gray10", "#DCE4EE"],
|
"text_color":["gray10", "#DCE4EE"],
|
||||||
"placeholder_text_color": ["gray52", "gray62"]
|
"placeholder_text_color": ["gray52", "gray62"]
|
||||||
},
|
},
|
||||||
"CTkCheckbox": {
|
"CTkCheckBox": {
|
||||||
"corner_radius": 6,
|
"corner_radius": 6,
|
||||||
"border_width": 3,
|
"border_width": 3,
|
||||||
"fg_color": ["#2CC985", "#2FA572"],
|
"fg_color": ["#2CC985", "#2FA572"],
|
||||||
@ -55,7 +55,7 @@
|
|||||||
"text_color": ["gray10", "#DCE4EE"],
|
"text_color": ["gray10", "#DCE4EE"],
|
||||||
"text_color_disabled": ["gray60", "gray45"]
|
"text_color_disabled": ["gray60", "gray45"]
|
||||||
},
|
},
|
||||||
"CTkRadiobutton": {
|
"CTkRadioButton": {
|
||||||
"corner_radius": 1000,
|
"corner_radius": 1000,
|
||||||
"border_width_checked": 6,
|
"border_width_checked": 6,
|
||||||
"border_width_unchecked": 3,
|
"border_width_unchecked": 3,
|
||||||
|
@ -86,7 +86,7 @@ class CTkInputDialog(CTkToplevel):
|
|||||||
hover_color=self._button_hover_color,
|
hover_color=self._button_hover_color,
|
||||||
text_color=self._button_text_color,
|
text_color=self._button_text_color,
|
||||||
text='Cancel',
|
text='Cancel',
|
||||||
command=self._ok_event)
|
command=self._cancel_event)
|
||||||
self._cancel_button.grid(row=2, column=1, columnspan=1, padx=(10, 20), pady=(0, 20), sticky="ew")
|
self._cancel_button.grid(row=2, column=1, columnspan=1, padx=(10, 20), pady=(0, 20), sticky="ew")
|
||||||
|
|
||||||
self.after(150, lambda: self._entry.focus()) # set focus to entry with slight delay, otherwise it won't work
|
self.after(150, lambda: self._entry.focus()) # set focus to entry with slight delay, otherwise it won't work
|
||||||
|
@ -436,6 +436,7 @@ class CTkButton(CTkBaseClass):
|
|||||||
|
|
||||||
if "anchor" in kwargs:
|
if "anchor" in kwargs:
|
||||||
self._anchor = kwargs.pop("anchor")
|
self._anchor = kwargs.pop("anchor")
|
||||||
|
self._create_grid()
|
||||||
require_redraw = True
|
require_redraw = True
|
||||||
|
|
||||||
super().configure(require_redraw=require_redraw, **kwargs)
|
super().configure(require_redraw=require_redraw, **kwargs)
|
||||||
|
@ -51,20 +51,20 @@ class CTkCheckBox(CTkBaseClass):
|
|||||||
self._checkbox_height = checkbox_height
|
self._checkbox_height = checkbox_height
|
||||||
|
|
||||||
# color
|
# color
|
||||||
self._fg_color = ThemeManager.theme["CTkCheckbox"]["fg_color"] if fg_color is None else self._check_color_type(fg_color)
|
self._fg_color = ThemeManager.theme["CTkCheckBox"]["fg_color"] if fg_color is None else self._check_color_type(fg_color)
|
||||||
self._hover_color = ThemeManager.theme["CTkCheckbox"]["hover_color"] if hover_color is None else self._check_color_type(hover_color)
|
self._hover_color = ThemeManager.theme["CTkCheckBox"]["hover_color"] if hover_color is None else self._check_color_type(hover_color)
|
||||||
self._border_color = ThemeManager.theme["CTkCheckbox"]["border_color"] if border_color is None else self._check_color_type(border_color)
|
self._border_color = ThemeManager.theme["CTkCheckBox"]["border_color"] if border_color is None else self._check_color_type(border_color)
|
||||||
self._checkmark_color = ThemeManager.theme["CTkCheckbox"]["checkmark_color"] if checkmark_color is None else self._check_color_type(checkmark_color)
|
self._checkmark_color = ThemeManager.theme["CTkCheckBox"]["checkmark_color"] if checkmark_color is None else self._check_color_type(checkmark_color)
|
||||||
|
|
||||||
# shape
|
# shape
|
||||||
self._corner_radius = ThemeManager.theme["CTkCheckbox"]["corner_radius"] if corner_radius is None else corner_radius
|
self._corner_radius = ThemeManager.theme["CTkCheckBox"]["corner_radius"] if corner_radius is None else corner_radius
|
||||||
self._border_width = ThemeManager.theme["CTkCheckbox"]["border_width"] if border_width is None else border_width
|
self._border_width = ThemeManager.theme["CTkCheckBox"]["border_width"] if border_width is None else border_width
|
||||||
|
|
||||||
# text
|
# text
|
||||||
self._text = text
|
self._text = text
|
||||||
self._text_label: Union[tkinter.Label, None] = None
|
self._text_label: Union[tkinter.Label, None] = None
|
||||||
self._text_color = ThemeManager.theme["CTkCheckbox"]["text_color"] if text_color is None else self._check_color_type(text_color)
|
self._text_color = ThemeManager.theme["CTkCheckBox"]["text_color"] if text_color is None else self._check_color_type(text_color)
|
||||||
self._text_color_disabled = ThemeManager.theme["CTkCheckbox"]["text_color_disabled"] if text_color_disabled is None else self._check_color_type(text_color_disabled)
|
self._text_color_disabled = ThemeManager.theme["CTkCheckBox"]["text_color_disabled"] if text_color_disabled is None else self._check_color_type(text_color_disabled)
|
||||||
|
|
||||||
# font
|
# font
|
||||||
self._font = CTkFont() if font is None else self._check_font_type(font)
|
self._font = CTkFont() if font is None else self._check_font_type(font)
|
||||||
@ -265,12 +265,20 @@ class CTkCheckBox(CTkBaseClass):
|
|||||||
self._hover_color = self._check_color_type(kwargs.pop("hover_color"))
|
self._hover_color = self._check_color_type(kwargs.pop("hover_color"))
|
||||||
require_redraw = True
|
require_redraw = True
|
||||||
|
|
||||||
|
if "border_color" in kwargs:
|
||||||
|
self._border_color = self._check_color_type(kwargs.pop("border_color"))
|
||||||
|
require_redraw = True
|
||||||
|
|
||||||
|
if "checkmark_color" in kwargs:
|
||||||
|
self._checkmark_color = self._check_color_type(kwargs.pop("checkmark_color"))
|
||||||
|
require_redraw = True
|
||||||
|
|
||||||
if "text_color" in kwargs:
|
if "text_color" in kwargs:
|
||||||
self._text_color = self._check_color_type(kwargs.pop("text_color"))
|
self._text_color = self._check_color_type(kwargs.pop("text_color"))
|
||||||
require_redraw = True
|
require_redraw = True
|
||||||
|
|
||||||
if "border_color" in kwargs:
|
if "text_color_disabled" in kwargs:
|
||||||
self._border_color = self._check_color_type(kwargs.pop("border_color"))
|
self._text_color_disabled = self._check_color_type(kwargs.pop("text_color_disabled"))
|
||||||
require_redraw = True
|
require_redraw = True
|
||||||
|
|
||||||
if "hover" in kwargs:
|
if "hover" in kwargs:
|
||||||
|
@ -31,6 +31,7 @@ class CTkLabel(CTkBaseClass):
|
|||||||
bg_color: Union[str, Tuple[str, str]] = "transparent",
|
bg_color: Union[str, Tuple[str, str]] = "transparent",
|
||||||
fg_color: Optional[Union[str, Tuple[str, str]]] = None,
|
fg_color: Optional[Union[str, Tuple[str, str]]] = None,
|
||||||
text_color: Optional[Union[str, Tuple[str, str]]] = None,
|
text_color: Optional[Union[str, Tuple[str, str]]] = None,
|
||||||
|
text_color_disabled: Optional[Union[str, Tuple[str, str]]] = None,
|
||||||
|
|
||||||
text: str = "CTkLabel",
|
text: str = "CTkLabel",
|
||||||
font: Optional[Union[tuple, CTkFont]] = None,
|
font: Optional[Union[tuple, CTkFont]] = None,
|
||||||
@ -47,6 +48,14 @@ class CTkLabel(CTkBaseClass):
|
|||||||
self._fg_color = ThemeManager.theme["CTkLabel"]["fg_color"] if fg_color is None else self._check_color_type(fg_color, transparency=True)
|
self._fg_color = ThemeManager.theme["CTkLabel"]["fg_color"] if fg_color is None else self._check_color_type(fg_color, transparency=True)
|
||||||
self._text_color = ThemeManager.theme["CTkLabel"]["text_color"] if text_color is None else self._check_color_type(text_color)
|
self._text_color = ThemeManager.theme["CTkLabel"]["text_color"] if text_color is None else self._check_color_type(text_color)
|
||||||
|
|
||||||
|
if text_color_disabled is None:
|
||||||
|
if "text_color_disabled" in ThemeManager.theme["CTkLabel"]:
|
||||||
|
self._text_color_disabled = ThemeManager.theme["CTkLabel"]["text_color"]
|
||||||
|
else:
|
||||||
|
self._text_color_disabled = self._text_color
|
||||||
|
else:
|
||||||
|
self._text_color_disabled = self._check_color_type(text_color_disabled)
|
||||||
|
|
||||||
# shape
|
# shape
|
||||||
self._corner_radius = ThemeManager.theme["CTkLabel"]["corner_radius"] if corner_radius is None else corner_radius
|
self._corner_radius = ThemeManager.theme["CTkLabel"]["corner_radius"] if corner_radius is None else corner_radius
|
||||||
|
|
||||||
@ -161,6 +170,7 @@ class CTkLabel(CTkBaseClass):
|
|||||||
outline=self._apply_appearance_mode(self._bg_color))
|
outline=self._apply_appearance_mode(self._bg_color))
|
||||||
|
|
||||||
self._label.configure(fg=self._apply_appearance_mode(self._text_color),
|
self._label.configure(fg=self._apply_appearance_mode(self._text_color),
|
||||||
|
disabledforeground=self._apply_appearance_mode(self._text_color_disabled),
|
||||||
bg=self._apply_appearance_mode(self._bg_color))
|
bg=self._apply_appearance_mode(self._bg_color))
|
||||||
else:
|
else:
|
||||||
self._canvas.itemconfig("inner_parts",
|
self._canvas.itemconfig("inner_parts",
|
||||||
@ -168,6 +178,7 @@ class CTkLabel(CTkBaseClass):
|
|||||||
outline=self._apply_appearance_mode(self._fg_color))
|
outline=self._apply_appearance_mode(self._fg_color))
|
||||||
|
|
||||||
self._label.configure(fg=self._apply_appearance_mode(self._text_color),
|
self._label.configure(fg=self._apply_appearance_mode(self._text_color),
|
||||||
|
disabledforeground=self._apply_appearance_mode(self._text_color_disabled),
|
||||||
bg=self._apply_appearance_mode(self._fg_color))
|
bg=self._apply_appearance_mode(self._fg_color))
|
||||||
|
|
||||||
self._canvas.configure(bg=self._apply_appearance_mode(self._bg_color))
|
self._canvas.configure(bg=self._apply_appearance_mode(self._bg_color))
|
||||||
@ -186,6 +197,10 @@ class CTkLabel(CTkBaseClass):
|
|||||||
self._text_color = self._check_color_type(kwargs.pop("text_color"))
|
self._text_color = self._check_color_type(kwargs.pop("text_color"))
|
||||||
require_redraw = True
|
require_redraw = True
|
||||||
|
|
||||||
|
if "text_color_disabled" in kwargs:
|
||||||
|
self._text_color_disabled = self._check_color_type(kwargs.pop("text_color_disabled"))
|
||||||
|
require_redraw = True
|
||||||
|
|
||||||
if "text" in kwargs:
|
if "text" in kwargs:
|
||||||
self._text = kwargs.pop("text")
|
self._text = kwargs.pop("text")
|
||||||
self._label.configure(text=self._text)
|
self._label.configure(text=self._text)
|
||||||
@ -230,6 +245,8 @@ class CTkLabel(CTkBaseClass):
|
|||||||
return self._fg_color
|
return self._fg_color
|
||||||
elif attribute_name == "text_color":
|
elif attribute_name == "text_color":
|
||||||
return self._text_color
|
return self._text_color
|
||||||
|
elif attribute_name == "text_color_disabled":
|
||||||
|
return self._text_color_disabled
|
||||||
|
|
||||||
elif attribute_name == "text":
|
elif attribute_name == "text":
|
||||||
return self._text
|
return self._text
|
||||||
|
@ -243,6 +243,10 @@ class CTkOptionMenu(CTkBaseClass):
|
|||||||
self._text_color = self._check_color_type(kwargs.pop("text_color"))
|
self._text_color = self._check_color_type(kwargs.pop("text_color"))
|
||||||
require_redraw = True
|
require_redraw = True
|
||||||
|
|
||||||
|
if "text_color_disabled" in kwargs:
|
||||||
|
self._text_color_disabled = self._check_color_type(kwargs.pop("text_color_disabled"))
|
||||||
|
require_redraw = True
|
||||||
|
|
||||||
if "dropdown_fg_color" in kwargs:
|
if "dropdown_fg_color" in kwargs:
|
||||||
self._dropdown_menu.configure(fg_color=kwargs.pop("dropdown_fg_color"))
|
self._dropdown_menu.configure(fg_color=kwargs.pop("dropdown_fg_color"))
|
||||||
|
|
||||||
@ -261,8 +265,12 @@ class CTkOptionMenu(CTkBaseClass):
|
|||||||
|
|
||||||
self._update_font()
|
self._update_font()
|
||||||
|
|
||||||
if "command" in kwargs:
|
if "dropdown_font" in kwargs:
|
||||||
self._command = kwargs.pop("command")
|
self._dropdown_menu.configure(font=kwargs.pop("dropdown_font"))
|
||||||
|
|
||||||
|
if "values" in kwargs:
|
||||||
|
self._values = kwargs.pop("values")
|
||||||
|
self._dropdown_menu.configure(values=self._values)
|
||||||
|
|
||||||
if "variable" in kwargs:
|
if "variable" in kwargs:
|
||||||
if self._variable is not None: # remove old callback
|
if self._variable is not None: # remove old callback
|
||||||
@ -277,19 +285,15 @@ class CTkOptionMenu(CTkBaseClass):
|
|||||||
else:
|
else:
|
||||||
self._variable = None
|
self._variable = None
|
||||||
|
|
||||||
if "values" in kwargs:
|
if "state" in kwargs:
|
||||||
self._values = kwargs.pop("values")
|
self._state = kwargs.pop("state")
|
||||||
self._dropdown_menu.configure(values=self._values)
|
require_redraw = True
|
||||||
|
|
||||||
if "dropdown_font" in kwargs:
|
|
||||||
self._dropdown_menu.configure(font=kwargs.pop("dropdown_font"))
|
|
||||||
|
|
||||||
if "hover" in kwargs:
|
if "hover" in kwargs:
|
||||||
self._hover = kwargs.pop("hover")
|
self._hover = kwargs.pop("hover")
|
||||||
|
|
||||||
if "state" in kwargs:
|
if "command" in kwargs:
|
||||||
self._state = kwargs.pop("state")
|
self._command = kwargs.pop("command")
|
||||||
require_redraw = True
|
|
||||||
|
|
||||||
if "dynamic_resizing" in kwargs:
|
if "dynamic_resizing" in kwargs:
|
||||||
self._dynamic_resizing = kwargs.pop("dynamic_resizing")
|
self._dynamic_resizing = kwargs.pop("dynamic_resizing")
|
||||||
|
@ -50,20 +50,20 @@ class CTkRadioButton(CTkBaseClass):
|
|||||||
self._radiobutton_height = radiobutton_height
|
self._radiobutton_height = radiobutton_height
|
||||||
|
|
||||||
# color
|
# color
|
||||||
self._fg_color = ThemeManager.theme["CTkRadiobutton"]["fg_color"] if fg_color is None else self._check_color_type(fg_color)
|
self._fg_color = ThemeManager.theme["CTkRadioButton"]["fg_color"] if fg_color is None else self._check_color_type(fg_color)
|
||||||
self._hover_color = ThemeManager.theme["CTkRadiobutton"]["hover_color"] if hover_color is None else self._check_color_type(hover_color)
|
self._hover_color = ThemeManager.theme["CTkRadioButton"]["hover_color"] if hover_color is None else self._check_color_type(hover_color)
|
||||||
self._border_color = ThemeManager.theme["CTkRadiobutton"]["border_color"] if border_color is None else self._check_color_type(border_color)
|
self._border_color = ThemeManager.theme["CTkRadioButton"]["border_color"] if border_color is None else self._check_color_type(border_color)
|
||||||
|
|
||||||
# shape
|
# shape
|
||||||
self._corner_radius = ThemeManager.theme["CTkRadiobutton"]["corner_radius"] if corner_radius is None else corner_radius
|
self._corner_radius = ThemeManager.theme["CTkRadioButton"]["corner_radius"] if corner_radius is None else corner_radius
|
||||||
self._border_width_unchecked = ThemeManager.theme["CTkRadiobutton"]["border_width_unchecked"] if border_width_unchecked is None else border_width_unchecked
|
self._border_width_unchecked = ThemeManager.theme["CTkRadioButton"]["border_width_unchecked"] if border_width_unchecked is None else border_width_unchecked
|
||||||
self._border_width_checked = ThemeManager.theme["CTkRadiobutton"]["border_width_checked"] if border_width_checked is None else border_width_checked
|
self._border_width_checked = ThemeManager.theme["CTkRadioButton"]["border_width_checked"] if border_width_checked is None else border_width_checked
|
||||||
|
|
||||||
# text
|
# text
|
||||||
self._text = text
|
self._text = text
|
||||||
self._text_label: Union[tkinter.Label, None] = None
|
self._text_label: Union[tkinter.Label, None] = None
|
||||||
self._text_color = ThemeManager.theme["CTkRadiobutton"]["text_color"] if text_color is None else self._check_color_type(text_color)
|
self._text_color = ThemeManager.theme["CTkRadioButton"]["text_color"] if text_color is None else self._check_color_type(text_color)
|
||||||
self._text_color_disabled = ThemeManager.theme["CTkRadiobutton"]["text_color_disabled"] if text_color_disabled is None else self._check_color_type(text_color_disabled)
|
self._text_color_disabled = ThemeManager.theme["CTkRadioButton"]["text_color_disabled"] if text_color_disabled is None else self._check_color_type(text_color_disabled)
|
||||||
|
|
||||||
# font
|
# font
|
||||||
self._font = CTkFont() if font is None else self._check_font_type(font)
|
self._font = CTkFont() if font is None else self._check_font_type(font)
|
||||||
|
@ -10,6 +10,7 @@ from .theme import ThemeManager
|
|||||||
from .font import CTkFont
|
from .font import CTkFont
|
||||||
from .ctk_button import CTkButton
|
from .ctk_button import CTkButton
|
||||||
from .ctk_frame import CTkFrame
|
from .ctk_frame import CTkFrame
|
||||||
|
from .utility import check_kwargs_empty
|
||||||
|
|
||||||
|
|
||||||
class CTkSegmentedButton(CTkFrame):
|
class CTkSegmentedButton(CTkFrame):
|
||||||
@ -40,10 +41,9 @@ class CTkSegmentedButton(CTkFrame):
|
|||||||
variable: Union[tkinter.Variable, None] = None,
|
variable: Union[tkinter.Variable, None] = None,
|
||||||
dynamic_resizing: bool = True,
|
dynamic_resizing: bool = True,
|
||||||
command: Union[Callable[[str], None], None] = None,
|
command: Union[Callable[[str], None], None] = None,
|
||||||
state: str = "normal",
|
state: str = "normal"):
|
||||||
**kwargs):
|
|
||||||
|
|
||||||
super().__init__(master=master, bg_color=bg_color, width=width, height=height, **kwargs)
|
super().__init__(master=master, bg_color=bg_color, width=width, height=height)
|
||||||
|
|
||||||
self._sb_fg_color = ThemeManager.theme["CTkSegmentedButton"]["fg_color"] if fg_color is None else self._check_color_type(fg_color)
|
self._sb_fg_color = ThemeManager.theme["CTkSegmentedButton"]["fg_color"] if fg_color is None else self._check_color_type(fg_color)
|
||||||
|
|
||||||
@ -186,7 +186,7 @@ class CTkSegmentedButton(CTkFrame):
|
|||||||
|
|
||||||
for index, value in enumerate(self._value_list):
|
for index, value in enumerate(self._value_list):
|
||||||
self.grid_columnconfigure(index, weight=1, minsize=self._current_height)
|
self.grid_columnconfigure(index, weight=1, minsize=self._current_height)
|
||||||
self._buttons_dict[value].grid(row=0, column=index, sticky="ew")
|
self._buttons_dict[value].grid(row=0, column=index, sticky="nsew")
|
||||||
|
|
||||||
def _create_buttons_from_values(self):
|
def _create_buttons_from_values(self):
|
||||||
assert len(self._buttons_dict) == 0
|
assert len(self._buttons_dict) == 0
|
||||||
@ -197,6 +197,23 @@ class CTkSegmentedButton(CTkFrame):
|
|||||||
self._configure_button_corners_for_index(index)
|
self._configure_button_corners_for_index(index)
|
||||||
|
|
||||||
def configure(self, **kwargs):
|
def configure(self, **kwargs):
|
||||||
|
if "width" in kwargs:
|
||||||
|
super().configure(width=kwargs.pop("width"))
|
||||||
|
|
||||||
|
if "height" in kwargs:
|
||||||
|
super().configure(height=kwargs.pop("height"))
|
||||||
|
|
||||||
|
if "corner_radius" in kwargs:
|
||||||
|
self._sb_corner_radius = kwargs.pop("corner_radius")
|
||||||
|
super().configure(corner_radius=self._sb_corner_radius)
|
||||||
|
for button in self._buttons_dict.values():
|
||||||
|
button.configure(corner_radius=self._sb_corner_radius)
|
||||||
|
|
||||||
|
if "border_width" in kwargs:
|
||||||
|
self._sb_border_width = kwargs.pop("border_width")
|
||||||
|
for button in self._buttons_dict.values():
|
||||||
|
button.configure(border_width=self._sb_border_width)
|
||||||
|
|
||||||
if "bg_color" in kwargs:
|
if "bg_color" in kwargs:
|
||||||
super().configure(bg_color=kwargs.pop("bg_color"))
|
super().configure(bg_color=kwargs.pop("bg_color"))
|
||||||
|
|
||||||
@ -296,14 +313,20 @@ class CTkSegmentedButton(CTkFrame):
|
|||||||
for button in self._buttons_dict.values():
|
for button in self._buttons_dict.values():
|
||||||
button.configure(state=self._state)
|
button.configure(state=self._state)
|
||||||
|
|
||||||
super().configure(**kwargs)
|
check_kwargs_empty(kwargs, raise_error=True)
|
||||||
|
|
||||||
def cget(self, attribute_name: str) -> any:
|
def cget(self, attribute_name: str) -> any:
|
||||||
if attribute_name == "corner_radius":
|
if attribute_name == "width":
|
||||||
|
return super().cget(attribute_name)
|
||||||
|
elif attribute_name == "height":
|
||||||
|
return super().cget(attribute_name)
|
||||||
|
elif attribute_name == "corner_radius":
|
||||||
return self._sb_corner_radius
|
return self._sb_corner_radius
|
||||||
elif attribute_name == "border_width":
|
elif attribute_name == "border_width":
|
||||||
return self._sb_border_width
|
return self._sb_border_width
|
||||||
|
|
||||||
|
elif attribute_name == "bg_color":
|
||||||
|
return super().cget(attribute_name)
|
||||||
elif attribute_name == "fg_color":
|
elif attribute_name == "fg_color":
|
||||||
return self._sb_fg_color
|
return self._sb_fg_color
|
||||||
elif attribute_name == "selected_color":
|
elif attribute_name == "selected_color":
|
||||||
@ -331,7 +354,7 @@ class CTkSegmentedButton(CTkFrame):
|
|||||||
return self._command
|
return self._command
|
||||||
|
|
||||||
else:
|
else:
|
||||||
return super().cget(attribute_name)
|
raise ValueError(f"'{attribute_name}' is not a supported argument. Look at the documentation for supported arguments.")
|
||||||
|
|
||||||
def set(self, value: str, from_variable_callback: bool = False, from_button_callback: bool = False):
|
def set(self, value: str, from_variable_callback: bool = False, from_button_callback: bool = False):
|
||||||
if value == self._current_value:
|
if value == self._current_value:
|
||||||
|
@ -171,9 +171,10 @@ class CTkTabview(CTkBaseClass):
|
|||||||
padx=self._apply_widget_scaling(max(self._corner_radius, self._border_width)),
|
padx=self._apply_widget_scaling(max(self._corner_radius, self._border_width)),
|
||||||
pady=self._apply_widget_scaling(max(self._corner_radius, self._border_width)))
|
pady=self._apply_widget_scaling(max(self._corner_radius, self._border_width)))
|
||||||
|
|
||||||
def _grid_forget_all_tabs(self):
|
def _grid_forget_all_tabs(self, exclude_name=None):
|
||||||
for frame in self._tab_dict.values():
|
for name, frame in self._tab_dict.items():
|
||||||
frame.grid_forget()
|
if name != exclude_name:
|
||||||
|
frame.grid_forget()
|
||||||
|
|
||||||
def _create_tab(self) -> CTkFrame:
|
def _create_tab(self) -> CTkFrame:
|
||||||
new_tab = CTkFrame(self,
|
new_tab = CTkFrame(self,
|
||||||
@ -360,8 +361,8 @@ class CTkTabview(CTkBaseClass):
|
|||||||
if name in self._tab_dict:
|
if name in self._tab_dict:
|
||||||
self._current_name = name
|
self._current_name = name
|
||||||
self._segmented_button.set(name)
|
self._segmented_button.set(name)
|
||||||
self._grid_forget_all_tabs()
|
|
||||||
self._set_grid_tab_by_name(name)
|
self._set_grid_tab_by_name(name)
|
||||||
|
self.after(100, lambda: self._grid_forget_all_tabs(exclude_name=name))
|
||||||
else:
|
else:
|
||||||
raise ValueError(f"CTkTabview has no tab named '{name}'")
|
raise ValueError(f"CTkTabview has no tab named '{name}'")
|
||||||
|
|
||||||
|
@ -52,7 +52,10 @@ class CTkFont(Font):
|
|||||||
|
|
||||||
def remove_size_configure_callback(self, callback: Callable):
|
def remove_size_configure_callback(self, callback: Callable):
|
||||||
""" remove function, that gets called when font got configured """
|
""" remove function, that gets called when font got configured """
|
||||||
self._size_configure_callback_list.remove(callback)
|
try:
|
||||||
|
self._size_configure_callback_list.remove(callback)
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
|
|
||||||
def create_scaled_tuple(self, font_scaling: float) -> Tuple[str, int, str]:
|
def create_scaled_tuple(self, font_scaling: float) -> Tuple[str, int, str]:
|
||||||
""" return scaled tuple representation of font in the form (family: str, size: int, style: str)"""
|
""" return scaled tuple representation of font in the form (family: str, size: int, style: str)"""
|
||||||
|
@ -37,6 +37,12 @@ class ThemeManager:
|
|||||||
else:
|
else:
|
||||||
cls.theme[key] = cls.theme[key]["Linux"]
|
cls.theme[key] = cls.theme[key]["Linux"]
|
||||||
|
|
||||||
|
# fix name inconsistencies
|
||||||
|
if "CTkCheckbox" in cls.theme.keys():
|
||||||
|
cls.theme["CTkCheckBox"] = cls.theme.pop("CTkCheckbox")
|
||||||
|
if "CTkRadiobutton" in cls.theme.keys():
|
||||||
|
cls.theme["CTkRadioButton"] = cls.theme.pop("CTkRadiobutton")
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def save_theme(cls):
|
def save_theme(cls):
|
||||||
if cls._currently_loaded_theme is not None:
|
if cls._currently_loaded_theme is not None:
|
||||||
|
@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
github_url = "https://github.com/TomSchimansky/CustomTkinter"
|
github_url = "https://github.com/TomSchimansky/CustomTkinter"
|
||||||
|
|
||||||
[tool.tbump.version]
|
[tool.tbump.version]
|
||||||
current = "5.1.3"
|
current = "5.2.0"
|
||||||
|
|
||||||
# Example of a semver regexp.
|
# Example of a semver regexp.
|
||||||
# Make sure this matches current_version before
|
# Make sure this matches current_version before
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[project]
|
[metadata]
|
||||||
name = customtkinter
|
name = customtkinter
|
||||||
version = 5.1.3
|
version = 5.2.0
|
||||||
description = Create modern looking GUIs with Python
|
description = Create modern looking GUIs with Python
|
||||||
long_description = A modern and customizable python UI-library based on Tkinter: https://customtkinter.tomschimansky.com
|
long_description = A modern and customizable python UI-library based on Tkinter: https://customtkinter.tomschimansky.com
|
||||||
long_description_content_type = text/markdown
|
long_description_content_type = text/markdown
|
||||||
@ -9,7 +9,7 @@ author = Tom Schimansky
|
|||||||
license = Creative Commons Zero v1.0 Universal
|
license = Creative Commons Zero v1.0 Universal
|
||||||
license_file = LICENSE
|
license_file = LICENSE
|
||||||
classifiers =
|
classifiers =
|
||||||
License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
|
License :: MIT License
|
||||||
Operating System :: OS Independent
|
Operating System :: OS Independent
|
||||||
Programming Language :: Python :: 3 :: Only
|
Programming Language :: Python :: 3 :: Only
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user