mirror of
https://github.com/TomSchimansky/CustomTkinter.git
synced 2023-08-10 21:13:13 +03:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
__version__ = "4.5.11"
|
||||
__version__ = "4.6.3"
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
@@ -6,7 +6,7 @@ from typing import Union
|
||||
|
||||
class FontManager:
|
||||
|
||||
linux_font_path = "~/.local/share/fonts/"
|
||||
linux_font_path = "~/.fonts/"
|
||||
|
||||
@classmethod
|
||||
def init_font_manager(cls):
|
||||
|
||||
@@ -309,9 +309,6 @@ class CTkCheckBox(CTkBaseClass):
|
||||
self.variable.set(self.onvalue)
|
||||
self.variable_callback_blocked = False
|
||||
|
||||
if self.command is not None:
|
||||
self.command()
|
||||
|
||||
def deselect(self, from_variable_callback=False):
|
||||
self.check_state = False
|
||||
self.draw()
|
||||
@@ -321,8 +318,5 @@ class CTkCheckBox(CTkBaseClass):
|
||||
self.variable.set(self.offvalue)
|
||||
self.variable_callback_blocked = False
|
||||
|
||||
if self.command is not None:
|
||||
self.command()
|
||||
|
||||
def get(self):
|
||||
return self.onvalue if self.check_state is True else self.offvalue
|
||||
|
||||
@@ -226,7 +226,8 @@ class CTkOptionMenu(CTkBaseClass):
|
||||
|
||||
if self.variable is not None and self.variable != "":
|
||||
self.variable_callback_name = self.variable.trace_add("write", self.variable_callback)
|
||||
self.set(self.variable.get(), block_set_variable=True)
|
||||
self.current_value = self.variable.get()
|
||||
self.text_label.configure(text=self.current_value)
|
||||
else:
|
||||
self.variable = None
|
||||
|
||||
|
||||
Reference in New Issue
Block a user