mirror/CustomTkinter
1
0
Fork 0
mirror of https://github.com/TomSchimansky/CustomTkinter.git synced 2023-08-10 21:13:13 +03:00
Code Issues Projects Releases Wiki Activity

added orientation for CTkSLider, CTkProgressBar

Browse Source
This commit is contained in:
Tom Schimansky
2022-05-16 16:51:19 +02:00
parent a688d07b2a
commit b21c3fa19a
45 changed files with 458 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customtkinter/widgets/ctk_button.py
View File

@@ -3,7 +3,7 @@ import sys
import math
from .ctk_canvas import CTkCanvas
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
from ..ctk_settings import CTkSettings
from ..ctk_draw_engine import CTkDrawEngine
from .widget_base_class import CTkBaseClass

12
customtkinter/widgets/ctk_checkbox.py
View File

@@ -2,7 +2,7 @@ import tkinter
import sys
from .ctk_canvas import CTkCanvas
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
from ..ctk_settings import CTkSettings
from ..ctk_draw_engine import CTkDrawEngine
from .widget_base_class import CTkBaseClass
@@ -325,7 +325,10 @@ class CTkCheckBox(CTkBaseClass):
self.variable_callback_blocked = False
if self.function is not None:
self.function()
try:
self.function()
except:
pass
def deselect(self, from_variable_callback=False):
self.check_state = False
@@ -337,7 +340,10 @@ class CTkCheckBox(CTkBaseClass):
self.variable_callback_blocked = False
if self.function is not None:
self.function()
try:
self.function()
except:
pass
def get(self):
return self.onvalue if self.check_state is True else self.offvalue

2
customtkinter/widgets/ctk_entry.py
View File

@@ -1,7 +1,7 @@
import tkinter
from .ctk_canvas import CTkCanvas
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
from ..ctk_settings import CTkSettings
from ..ctk_draw_engine import CTkDrawEngine
from .widget_base_class import CTkBaseClass

2
customtkinter/widgets/ctk_frame.py
View File

@@ -1,7 +1,7 @@
import tkinter
from .ctk_canvas import CTkCanvas
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
from ..ctk_settings import CTkSettings
from ..ctk_draw_engine import CTkDrawEngine
from .widget_base_class import CTkBaseClass

2
customtkinter/widgets/ctk_label.py
View File

@@ -1,7 +1,7 @@
import tkinter
from .ctk_canvas import CTkCanvas
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
from ..ctk_settings import CTkSettings
from ..ctk_draw_engine import CTkDrawEngine
from .widget_base_class import CTkBaseClass

30
customtkinter/widgets/ctk_progressbar.py
View File

@@ -1,7 +1,7 @@
import tkinter
from .ctk_canvas import CTkCanvas
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
from ..ctk_draw_engine import CTkDrawEngine
from ..ctk_settings import CTkSettings
from .widget_base_class import CTkBaseClass
@@ -17,11 +17,24 @@ class CTkProgressBar(CTkBaseClass):
fg_color="default_theme",
progress_color="default_theme",
corner_radius="default_theme",
width=200,
height=8,
width=None,
height=None,
border_width="default_theme",
orient="horizontal",
**kwargs):
# set default dimensions according to orientation
if width is None:
if orient.lower() == "vertical":
width = 8
else:
width = 200
if height is None:
if orient.lower() == "vertical":
height = 200
else:
height = 8
# transfer basic functionality (bg_color, size, appearance_mode, scaling) to CTkBaseClass
super().__init__(*args, bg_color=bg_color, width=width, height=height, **kwargs)
@@ -39,6 +52,7 @@ class CTkProgressBar(CTkBaseClass):
self.corner_radius = CTkThemeManager.theme["shape"]["progressbar_corner_radius"] if corner_radius == "default_theme" else corner_radius
self.border_width = CTkThemeManager.theme["shape"]["progressbar_border_width"] if border_width == "default_theme" else border_width
self.value = 0.5
self.orient = orient
self.grid_rowconfigure(0, weight=1)
self.grid_columnconfigure(0, weight=1)
@@ -74,11 +88,19 @@ class CTkProgressBar(CTkBaseClass):
super().destroy()
def draw(self, no_color_updates=False):
if self.orient.lower() == "horizontal":
orientation = "w"
elif self.orient.lower() == "vertical":
orientation = "s"
else:
orientation = "w"
requires_recoloring = self.draw_engine.draw_rounded_progress_bar_with_border(self.apply_widget_scaling(self.current_width),
self.apply_widget_scaling(self.current_height),
self.apply_widget_scaling(self.corner_radius),
self.apply_widget_scaling(self.border_width),
self.value, "w")
self.value,
orientation)
if no_color_updates is False or requires_recoloring:
self.canvas.configure(bg=CTkThemeManager.single_color(self.bg_color, self.appearance_mode))

2
customtkinter/widgets/ctk_radiobutton.py
View File

@@ -2,7 +2,7 @@ import tkinter
import sys
from .ctk_canvas import CTkCanvas
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
from ..ctk_settings import CTkSettings
from ..ctk_draw_engine import CTkDrawEngine
from .widget_base_class import CTkBaseClass

34
customtkinter/widgets/ctk_slider.py
View File

@@ -2,7 +2,7 @@ import tkinter
import sys
from .ctk_canvas import CTkCanvas
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
from ..ctk_settings import CTkSettings
from ..ctk_draw_engine import CTkDrawEngine
from .widget_base_class import CTkBaseClass
@@ -21,16 +21,29 @@ class CTkSlider(CTkBaseClass):
from_=0,
to=1,
number_of_steps=None,
width=160,
height=16,
width=None,
height=None,
corner_radius="default_theme",
button_corner_radius="default_theme",
border_width="default_theme",
button_length="default_theme",
command=None,
variable=None,
orient="horizontal",
**kwargs):
# set default dimensions according to orientation
if width is None:
if orient.lower() == "vertical":
width = 16
else:
width = 200
if height is None:
if orient.lower() == "vertical":
height = 200
else:
height = 16
# transfer basic functionality (bg_color, size, appearance_mode, scaling) to CTkBaseClass
super().__init__(*args, bg_color=bg_color, width=width, height=height, **kwargs)
@@ -47,6 +60,7 @@ class CTkSlider(CTkBaseClass):
self.border_width = CTkThemeManager.theme["shape"]["slider_border_width"] if border_width == "default_theme" else border_width
self.button_length = CTkThemeManager.theme["shape"]["slider_button_length"] if button_length == "default_theme" else button_length
self.value = 0.5 # initial value of slider in percent
self.orient = orient
self.hover_state = False
self.from_ = from_
self.to = to
@@ -110,13 +124,20 @@ class CTkSlider(CTkBaseClass):
self.configure(cursor="hand2")
def draw(self, no_color_updates=False):
if self.orient.lower() == "horizontal":
orientation = "w"
elif self.orient.lower() == "vertical":
orientation = "s"
else:
orientation = "w"
requires_recoloring = self.draw_engine.draw_rounded_slider_with_border_and_button(self.apply_widget_scaling(self.current_width),
self.apply_widget_scaling(self.current_height),
self.apply_widget_scaling(self.corner_radius),
self.apply_widget_scaling(self.border_width),
self.apply_widget_scaling(self.button_length),
self.apply_widget_scaling(self.button_corner_radius),
self.value, "w")
self.value, orientation)
if no_color_updates is False or requires_recoloring:
self.canvas.configure(bg=CTkThemeManager.single_color(self.bg_color, self.appearance_mode))
@@ -142,7 +163,10 @@ class CTkSlider(CTkBaseClass):
outline=CTkThemeManager.single_color(self.button_color, self.appearance_mode))
def clicked(self, event=None):
self.value = (event.x / self.current_width) / self.widget_scaling
if self.orient.lower() == "horizontal":
self.value = (event.x / self.current_width) / self.widget_scaling
else:
self.value = 1 - (event.y / self.current_height) / self.widget_scaling
if self.value > 1:
self.value = 1

2
customtkinter/widgets/ctk_switch.py
View File

@@ -2,7 +2,7 @@ import tkinter
import sys
from .ctk_canvas import CTkCanvas
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
from ..ctk_settings import CTkSettings
from ..ctk_draw_engine import CTkDrawEngine
from .widget_base_class import CTkBaseClass

2
customtkinter/widgets/widget_base_class.py
View File

@@ -9,7 +9,7 @@ from ..windows.ctk_tk import CTk
from ..windows.ctk_toplevel import CTkToplevel
from ..appearance_mode_tracker import AppearanceModeTracker
from ..scaling_tracker import ScalingTracker
from ..theme_manager import CTkThemeManager
from ..ctk_theme_manager import CTkThemeManager
class CTkBaseClass(tkinter.Frame):