From 0d8d4084a9926842aef269f85143807ce1369231 Mon Sep 17 00:00:00 2001 From: Chuck <33324927+ChuckBuilds@users.noreply.github.com> Date: Wed, 13 Aug 2025 20:54:16 -0500 Subject: [PATCH] overzealous with the font change, rolling some back --- src/stock_manager.py | 8 ++++++-- src/weather_manager.py | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/stock_manager.py b/src/stock_manager.py index 47e07ae3..82785460 100644 --- a/src/stock_manager.py +++ b/src/stock_manager.py @@ -428,10 +428,14 @@ class StockManager: fallback = Image.new('RGBA', (32, 32), (0, 0, 0, 0)) draw = ImageDraw.Draw(fallback) try: - # Resolve font path absolutely to avoid fallback under systemd + # Resolve font path absolutely to avoid fallback under systemd; fall back to PS2P if missing script_dir = os.path.dirname(os.path.abspath(__file__)) font_path = os.path.abspath(os.path.join(script_dir, "../assets/fonts/OpenSans-Regular.ttf")) - font = ImageFont.truetype(font_path, 16) + try: + font = ImageFont.truetype(font_path, 16) + except Exception: + ps2p = os.path.abspath(os.path.join(script_dir, "../assets/fonts/PressStart2P-Regular.ttf")) + font = ImageFont.truetype(ps2p, 8) except: font = ImageFont.load_default() diff --git a/src/weather_manager.py b/src/weather_manager.py index 4b7d9095..35d862d4 100644 --- a/src/weather_manager.py +++ b/src/weather_manager.py @@ -337,8 +337,8 @@ class WeatherManager: # --- Right Side (Below Condition): Current Temp --- temp = round(weather_data['main']['temp']) temp_text = f"{temp}°" - # Ensure we use the intended PS2P font managed by DisplayManager - temp_font = getattr(self.display_manager, 'regular_font', self.display_manager.small_font) + # Use the small font from DisplayManager as before + temp_font = self.display_manager.small_font temp_text_width = draw.textlength(temp_text, font=temp_font) temp_x = self.display_manager.matrix.width - temp_text_width - 1 # Align right temp_y = condition_y + 8 # Position below condition text (adjust 8 based on font size)