ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-17 17:42:20 +03:00
Code Issues Projects Releases Wiki Activity

theme.py: Fix up some typing issues

Browse Source 
We're passing around *either* tk.Widget *or* tk.BitmapImage in places, but
tk.BitmapImage really isn't the same.  It doesn't have some functions, can't
be treated as a Dict etc.
This commit is contained in:
Athanasius 2022-12-05 12:10:30 +00:00
parent 62e285b52e
commit 09d632bb34
No known key found for this signature in database
GPG Key ID: 772697E181BB2767
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
theme.py
View File

@ -133,14 +133,14 @@ class _Theme(object):
def __init__(self) -> None: def __init__(self) -> None:
self.active = None # Starts out with no theme self.active = None # Starts out with no theme
self.minwidth: Optional[int] = None self.minwidth: Optional[int] = None
self.widgets: Dict[tk.Widget, Set] = {} self.widgets: Dict[tk.Widget | tk.BitmapImage, Set] = {}
self.widgets_pair: List = [] self.widgets_pair: List = []
self.defaults: Dict = {} self.defaults: Dict = {}
self.current: Dict = {} self.current: Dict = {}
self.default_ui_scale = None # None == not yet known self.default_ui_scale = None # None == not yet known
self.startup_ui_scale = None self.startup_ui_scale = None
def register(self, widget: tk.Widget) -> None: # noqa: CCR001, C901 def register(self, widget: tk.Widget | tk.BitmapImage) -> None: # noqa: CCR001, C901
# Note widget and children for later application of a theme. Note if # Note widget and children for later application of a theme. Note if
# the widget has explicit fg or bg attributes. # the widget has explicit fg or bg attributes.
assert isinstance(widget, tk.Widget) or isinstance(widget, tk.BitmapImage), widget assert isinstance(widget, tk.Widget) or isinstance(widget, tk.BitmapImage), widget
@ -310,9 +310,19 @@ class _Theme(object):
self._update_widget(child) self._update_widget(child)
# Apply current theme to a single widget # Apply current theme to a single widget
def _update_widget(self, widget: tk.Widget) -> None: # noqa: CCR001, C901 def _update_widget(self, widget: tk.Widget | tk.BitmapImage) -> None: # noqa: CCR001, C901
if widget not in self.widgets: if widget not in self.widgets:
assert_str = f'{widget.winfo_class()} {widget} "{"text" in widget.keys() and widget["text"]}"' if type(widget) == tk.Widget:
w_class = widget.winfo_class()
w_keys: List[str] = widget.keys()
else:
# There is no tk.BitmapImage.winfo_class()
w_class = ''
# There is no tk.BitmapImage.keys()
w_keys = []
assert_str = f'{w_class} {widget} "{"text" in w_keys and widget["text"]}"'
raise AssertionError(assert_str) raise AssertionError(assert_str)
attribs: Set = self.widgets.get(widget, set()) attribs: Set = self.widgets.get(widget, set())