Weather: show city name above the current conditions, toggleable
Just the city itself (first segment of the geocode label), not the full "City, State, Country" string -- too cluttered for a dashboard header. Off by default for manually-entered coordinates since there's no resolved place name to show there regardless of the toggle. New show_city setting, on by default, alongside the other display toggles in Weather settings.
This commit is contained in:
1 parent
322e2882ca
commit
96423e451b
3 files changed
+28
-3
No files matched your search
+23
-3
@@ -8,7 +8,7 @@ import requests
|
||||
from PIL import Image, ImageDraw
|
||||
|
||||
from screens.base import Screen
|
||||
from screens.render_utils import load_font, text_width
|
||||
from screens.render_utils import load_font, text_width, truncate_to_width
|
||||
from screens.weather_icons import WMO_CODES, draw_weather_icon
|
||||
|
||||
BLACK = (0, 0, 0)
|
||||
@@ -36,6 +36,7 @@ class WeatherScreen(Screen):
|
||||
"show_high_low": True,
|
||||
"show_rain_chance": True,
|
||||
"show_hourly_graph": True,
|
||||
"show_city": True,
|
||||
}
|
||||
|
||||
def get_poll_interval(self, settings: dict) -> int:
|
||||
@@ -212,8 +213,27 @@ class WeatherScreen(Screen):
|
||||
text_gap = temp_h * 0.22
|
||||
text_block_h = temp_h + text_gap + desc_h + ((text_gap + extra_h) if extra_line else 0)
|
||||
current_h = max(icon_size, text_block_h)
|
||||
top_pad = (height - current_h) / 2 if lower_sections == 0 else height * 0.05
|
||||
block_top = top_pad
|
||||
|
||||
# City name, above the icon/temp block -- just the city itself, not
|
||||
# the full "City, State, Country" geocode label (too long/cluttered
|
||||
# for a dashboard header). Nothing to show for manually-entered
|
||||
# coordinates, since there's no resolved place name for those.
|
||||
city_font = load_font(size=int(scale * 0.045), bold=True)
|
||||
city_label = ""
|
||||
city_h = city_gap = city_top = 0
|
||||
if settings.get("show_city", True) and settings.get("city"):
|
||||
city_label = truncate_to_width(draw, settings["city"].split(",")[0].strip(), city_font, width - 2 * pad)
|
||||
if city_label:
|
||||
city_left, city_top, city_right, city_bottom = draw.textbbox((0, 0), city_label, font=city_font)
|
||||
city_h = city_bottom - city_top
|
||||
city_gap = height * 0.025
|
||||
|
||||
total_top_h = city_h + city_gap + current_h
|
||||
top_pad = (height - total_top_h) / 2 if lower_sections == 0 else height * 0.05
|
||||
|
||||
if city_label:
|
||||
draw.text((pad, top_pad - city_top), city_label, font=city_font, fill="black")
|
||||
block_top = top_pad + city_h + city_gap
|
||||
|
||||
icon_cx = pad + icon_size / 2
|
||||
icon_cy = block_top + current_h / 2
|
||||
|
||||
Reference in new issue
Block a user