ColorTheme is no longer converted internally to a dataclass.

`Themable.color_theme` type is now `ColorTheme`.
`ColorPair` type removed.

Author: salt-die

docs/conf.py

@@ -37,7 +37,6 @@
 numpydoc_show_inherited_class_members = {
     "batgrl.colors.color_types.Color": False,
     "batgrl.colors.color_types.AColor": False,
-    "batgrl.colors.color_types.ColorPair": False,
     "batgrl.colors.color_types.ColorTheme": False,
     "batgrl.gadgets.gadget.PosHint": False,
     "batgrl.gadgets.gadget.SizeHint": False,

examples/advanced/exploding_logo_redux.py

@@ -181,7 +181,7 @@ def toggle_trans(toggle):
         def on_slide(p):
             field.alpha = p
 
-        bg_color = ToggleButton.color_theme.button_normal.bg
+        bg_color = trans_button.get_color("button_normal_bg")
         slider = Slider(
             min=0.0,
             max=1.0,

examples/advanced/isotiles.py

@@ -152,7 +152,7 @@ async def on_start(self):
             show_horizontal_bar=False,
             mouse_button="middle",
         )
-        sv.view = WorldGadget(blitter="half")
+        sv.view = WorldGadget(blitter="sixel")
         self.add_gadget(sv)
 
 

examples/basic/text_input.py

@@ -9,10 +9,10 @@
 from batgrl.gadgets.text_pad import TextPad
 from batgrl.gadgets.textbox import Textbox
 
-SECONDARY_FG = Color.from_hex(DEFAULT_COLOR_THEME["data_table_selected"]["fg"])
-SECONDARY_BG = Color.from_hex(DEFAULT_COLOR_THEME["data_table_selected"]["bg"])
-ACTIVE_COLOR = Color.from_hex(DEFAULT_COLOR_THEME["titlebar_normal"]["fg"])
-INACTIVE_COLOR = Color.from_hex(DEFAULT_COLOR_THEME["titlebar_normal"]["bg"])
+SECONDARY_FG = Color.from_hex(DEFAULT_COLOR_THEME["data_table_selected_fg"])
+SECONDARY_BG = Color.from_hex(DEFAULT_COLOR_THEME["data_table_selected_bg"])
+ACTIVE_COLOR = Color.from_hex(DEFAULT_COLOR_THEME["titlebar_normal_fg"])
+INACTIVE_COLOR = Color.from_hex(DEFAULT_COLOR_THEME["titlebar_normal_bg"])
 
 JABBERWOCKY = """
             Jabberwocky

src/batgrl/__init__.py

@@ -1,3 +1,3 @@
 """batgrl, the badass terminal graphics library."""
 
-__version__ = "0.42.0"
+__version__ = "0.43.0"

src/batgrl/app.py

@@ -228,12 +228,11 @@ def inline_height(self, inline_height: int):
     @property
     def color_theme(self) -> ColorTheme:
         """Color theme for themable gadgets."""
-        return self._color_theme
+        Themable.color_theme
 
     @color_theme.setter
     def color_theme(self, color_theme: ColorTheme):
-        self._color_theme = color_theme
-        Themable.set_theme(color_theme)
+        Themable.color_theme = color_theme
 
         if self.root is not None:
             for gadget in self.root.walk():

src/batgrl/colors/__init__.py

@@ -1,6 +1,6 @@
 """Color-related functions and data structures."""
 
-from .color_types import AColor, Color, ColorPair, ColorTheme
+from .color_types import AColor, AHexcode, Color, ColorTheme, Hexcode
 from .colors import (
     ABLACK,
     ABLUE,
@@ -56,9 +56,10 @@
     "WHITE_ON_BLACK",
     "YELLOW",
     "AColor",
+    "AHexcode",
     "Color",
-    "ColorPair",
     "ColorTheme",
+    "Hexcode",
     "Neptune",
     "darken_only",
     "gradient",