Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed typo in inputdialog, allowed font-definition in tabview and one fix #2186

Closed
wants to merge 4 commits into from
Closed

fixed typo in inputdialog, allowed font-definition in tabview and one fix #2186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20d35e5
Fixed typo in InputDialog
BhagyaJyoti22006 Jan 4, 2024
9aebc6b
Added value in radiobutton configuration
BhagyaJyoti22006 Jan 5, 2024
8f6cdb7
Allowed font-definition in tabview
BhagyaJyoti22006 Mar 18, 2024
fc16604
Added master parameter for PhotoImage object
BhagyaJyoti22006 Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion customtkinter/windows/ctk_input_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def __init__(self,
super().__init__(fg_color=fg_color)

self._fg_color = ThemeManager.theme["CTkToplevel"]["fg_color"] if fg_color is None else self._check_color_type(fg_color)
self._text_color = ThemeManager.theme["CTkLabel"]["text_color"] if text_color is None else self._check_color_type(button_hover_color)
self._text_color = ThemeManager.theme["CTkLabel"]["text_color"] if text_color is None else self._check_color_type(text_color)
self._button_fg_color = ThemeManager.theme["CTkButton"]["fg_color"] if button_fg_color is None else self._check_color_type(button_fg_color)
self._button_hover_color = ThemeManager.theme["CTkButton"]["hover_color"] if button_hover_color is None else self._check_color_type(button_hover_color)
self._button_text_color = ThemeManager.theme["CTkButton"]["text_color"] if button_text_color is None else self._check_color_type(button_text_color)
Expand Down
5 changes: 4 additions & 1 deletion customtkinter/windows/widgets/ctk_radiobutton.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,10 @@ def configure(self, require_redraw=False, **kwargs):
if "textvariable" in kwargs:
self._textvariable = kwargs.pop("textvariable")
self._text_label.configure(textvariable=self._textvariable)


if "value" in kwargs:
self._value = kwargs.pop("value")

if "variable" in kwargs:
if self._variable is not None:
self._variable.trace_remove("write", self._variable_callback_name)
Expand Down
2 changes: 2 additions & 0 deletions customtkinter/windows/widgets/ctk_tabview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def __init__(self,

text_color: Optional[Union[str, Tuple[str, str]]] = None,
text_color_disabled: Optional[Union[str, Tuple[str, str]]] = None,
font=None,

command: Union[Callable, None] = None,
anchor: str = "center",
Expand Down Expand Up @@ -89,6 +90,7 @@ def __init__(self,
border_width=self._segmented_button_border_width,
command=self._segmented_button_callback,
state=state)
if font is not None: self._segmented_button.configure(font=font)
self._configure_segmented_button_background_corners()
self._configure_grid()
self._set_grid_canvas()
Expand Down
11 changes: 7 additions & 4 deletions customtkinter/windows/widgets/image/ctk_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,20 @@ class CTkImage:

_checked_PIL_import = False

def __init__(self,
def __init__(self, master=None,
light_image: "Image.Image" = None,
dark_image: "Image.Image" = None,
size: Tuple[int, int] = (20, 20)):

if not self._checked_PIL_import:
self._check_pil_import()

self.master = master
self._light_image = light_image
self._dark_image = dark_image
self._check_images()
self._size = size

self._configure_callback_list: List[Callable] = []
self._scaled_light_photo_images: Dict[Tuple[int, int], ImageTk.PhotoImage] = {}
self._scaled_dark_photo_images: Dict[Tuple[int, int], ImageTk.PhotoImage] = {}
Expand Down Expand Up @@ -96,14 +97,16 @@ def _get_scaled_light_photo_image(self, scaled_size: Tuple[int, int]) -> "ImageT
if scaled_size in self._scaled_light_photo_images:
return self._scaled_light_photo_images[scaled_size]
else:
self._scaled_light_photo_images[scaled_size] = ImageTk.PhotoImage(self._light_image.resize(scaled_size))
self._scaled_light_photo_images[scaled_size] = ImageTk.PhotoImage(self._light_image.resize(scaled_size),
master = self.master)
return self._scaled_light_photo_images[scaled_size]

def _get_scaled_dark_photo_image(self, scaled_size: Tuple[int, int]) -> "ImageTk.PhotoImage":
if scaled_size in self._scaled_dark_photo_images:
return self._scaled_dark_photo_images[scaled_size]
else:
self._scaled_dark_photo_images[scaled_size] = ImageTk.PhotoImage(self._dark_image.resize(scaled_size))
self._scaled_dark_photo_images[scaled_size] = ImageTk.PhotoImage(self._dark_image.resize(scaled_size),
master = self.master)
return self._scaled_dark_photo_images[scaled_size]

def create_scaled_photo_image(self, widget_scaling: float, appearance_mode: str) -> "ImageTk.PhotoImage":
Expand Down