piker/tsp/_annotate.py

@@ -30,7 +30,7 @@ import tractor
 
 from piker.data._formatters import BGM
 from piker.storage import log
-from piker.ui._style import get_fonts
+# from piker.ui._style import _font
 
 if TYPE_CHECKING:
     from piker.ui._remote_ctl import AnnotCtl
@@ -88,10 +88,6 @@ async def markup_gaps(
     wdts: pl.DataFrame,
     gaps: pl.DataFrame,
 
-    # XXX, switch on to see txt showing a "humanized" label of each
-    # gap's duration.
-    show_txt: bool = False,
-
 ) -> dict[int, dict]:
     '''
     Remote annotate time-gaps in a dt-fielded ts (normally OHLC)
@@ -206,10 +202,6 @@ async def markup_gaps(
 
         diff: float = cls - opn
         sgn: float = copysign(1, diff)
-        up_gap: bool = sgn == -1
-        down_gap: bool = sgn == 1
-        flat: bool = sgn == 0
-
         color: str = 'dad_blue'
         # TODO? mks more sense to have up/down coloring?
         # color: str = {
@@ -241,7 +233,7 @@ async def markup_gaps(
         assert aid
         aids[aid] = rect_kwargs
         direction: str = (
-            'down' if down_gap
+            'down' if sgn == 1
             else 'up'
         )
         # TODO! mk this a `msgspec.Struct` which we deserialize
@@ -269,21 +261,19 @@ async def markup_gaps(
         )
 
         # add duration label to RHS of arrow
-        if up_gap:
-            anchor = (0, 0)
-            # ^XXX? i dun get dese dims.. XD
-        elif down_gap:
+        if sgn == -1:  # up-gap
+            anchor = (0, 0)  # XXX, i dun get dese dims.. XD
+        else:  # down-gap
             anchor = (0, 1)  # XXX y, x?
-        else:  # no-gap?
-            assert flat
-            anchor = (0, 0)  # up from bottom
 
-        # use a slightly smaller font for gap label txt.
-        font, small_font = get_fonts()
-        font_size: int = small_font.px_size - 1
-        assert isinstance(font_size, int)
+        # ?TODO? why returning -1 !?
+        # [ ] use conf.toml value instead!
+        #
+        # font_size: int = _font.font.pixelSize() - 10
+        # await tractor.pause()
+        # assert isinstance(font_size, int)
+        font_size = None
 
-        if show_txt:
         text_aid: int = await actl.add_text(
             fqme=fqme,
             timeframe=timeframe,

piker/ui/_remote_ctl.py

@@ -407,9 +407,8 @@ async def serve_rc_annots(
                 # apply font size (default to DpiAwareFont if not
                 # provided)
                 if font_size is None:
-                    from ._style import get_fonts
-                    font, font_small = get_fonts()
-                    font_size =  font_small.px_size - 1
+                    from ._style import _font
+                    font_size =  _font.font.pixelSize() - 3
 
                 qfont: QFont = text_item.textItem.font()
                 qfont.setPixelSize(font_size)

piker/ui/_style.py

@@ -61,7 +61,7 @@ class DpiAwareFont:
     ) -> None:
 
         self._font_size_calc_key: str = _font_size_key
-        self._font_size: int|None = None
+        self._font_size: int | None = None
 
         # Read preferred font size from main config file if it exists
         conf, path = config.load('conf', touch_if_dne=True)
@@ -107,22 +107,7 @@ class DpiAwareFont:
 
     @property
     def px_size(self) -> int:
-        size: int = self._qfont.pixelSize()
-
-        # XXX, when no Qt app has been spawned this will always be
-        # invalid..
-        # SO, just return any conf.toml value.
-        if size == -1:
-            if (conf_size := self._font_size) is None:
-                raise ValueError(
-                    f'No valid `{type(_font).__name__}.px_size` set?\n'
-                    f'\n'
-                    f'-> `ui.font_size` is NOT set in `conf.toml`\n'
-                    f'-> no Qt app is active ??\n'
-                )
-            return conf_size
-
-        return size
+        return self._qfont.pixelSize()
 
     def configure_to_dpi(self, screen: QtGui.QScreen | None = None):
         '''
@@ -236,20 +221,6 @@ def _config_fonts_to_screen() -> None:
     _font_small.configure_to_dpi()
 
 
-def get_fonts() -> tuple[
-    DpiAwareFont,
-    DpiAwareFont,
-]:
-    '''
-    Get the singleton font pair (of instances) from which all other
-    UI/UX should be "scaled around".
-
-    See `DpiAwareFont` for (internal) deats.
-
-    '''
-    return _font, _font_small
-
-
 # TODO: re-compute font size when main widget switches screens?
 # https://forum.qt.io/topic/54136/how-do-i-get-the-qscreen-my-widget-is-on-qapplication-desktop-screen-returns-a-qwidget-and-qobject_cast-qscreen-returns-null/3