Vibecode/epaper-dashboard
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REVERT: Indoor-Tag zeigt wieder nur Tag (kein Name in Tag-Box)

Browse Source 
Der Stationsname steht separat neben der Tag-Box, nicht darunter.
This commit is contained in:
ki
2026-08-31 03:21:24 +04:00
parent 21b4128f19
commit ee5280aa8c
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/netatmo.py
+9 -18
View File
@@ -567,27 +567,18 @@ class Widget(Widget):
draw.line((x + 6, ry + 2, x + w - 6, ry + 2), fill=FG, width=1) draw.line((x + 6, ry + 2, x + w - 6, ry + 2), fill=FG, width=1)
inner_x = x + 6 inner_x = x + 6
inner_w = w - 12 inner_w = w - 12
# HEAD: Tag-Box (links, zeigt Tag+Name) | Name (separat, nur wenn genug Platz) | Temp (rechts) # HEAD: Tag-Box (30px, nur Tag) | Name (gross, daneben) | Temp (rechts)
# Tag-Box: zeigt Tag (2 Zeichen) + full station name darunter
tag_w = 30 tag_w = 30
tag_full_w = inner_w // 3 # 1/3 der verfuegbaren Breite fuer Tag+Name draw.rectangle((inner_x, ry + 2, inner_x + tag_w, ry + 2 + head_h - 4),
tag_full_w = max(tag_full_w, 60) # mindestens 60px
draw.rectangle((inner_x, ry + 2, inner_x + tag_full_w, ry + 2 + head_h - 4),
fill=RED) fill=RED)
# Zeige Tag (2 Zeichen) + full station name darunter f_tag = _fit_size(draw, s["tag"], tag_w - 4, head_h - 8,
f_tag = _fit_size(draw, s["tag"], tag_full_w - 4, (head_h - 4) // 2, candidates=["28", "24", "22", "20"])
candidates=["24", "20", "18", "16"])
tw_, th_ = measure(draw, s["tag"], f_tag) tw_, th_ = measure(draw, s["tag"], f_tag)
draw.text((inner_x + (tag_full_w - tw_) // 2, ry + 3), s["tag"], font=f_tag, fill=WHITE) draw.text((inner_x + (tag_w - tw_) // 2, ry + 2 + (head_h - 4 - th_) // 2),
# Name unter dem Tag, kleiner s["tag"], font=f_tag, fill=WHITE)
f_name_tag = _fit_size(draw, s["name"], tag_full_w - 4, (head_h - 4) // 2 - 2, # Name GROSS daneben, wenn genug Platz
candidates=["14", "12", "11", "10"]) name_x = inner_x + tag_w + 8
nw_, nh_ = measure(draw, s["name"], f_name_tag) name_w = inner_w - tag_w - 8 - 130
draw.text((inner_x + (tag_full_w - nw_) // 2, ry + 3 + (head_h - 4) // 2),
s["name"], font=f_name_tag, fill=WHITE)
# Name (grosse Version) NEBEN der Tag-Box, nur wenn genug Platz
name_x = inner_x + tag_full_w + 8
name_w = inner_w - tag_full_w - 8 - 130
if name_w > 20: if name_w > 20:
f_name = _fit_size(draw, s["name"], name_w, head_h - 4, candidates=["24", "20", "18", "16"]) f_name = _fit_size(draw, s["name"], name_w, head_h - 4, candidates=["24", "20", "18", "16"])
text_in_box(draw, s["name"], name_x, ry + 2, name_w, head_h - 4, f_name, FG, "left") text_in_box(draw, s["name"], name_x, ry + 2, name_w, head_h - 4, f_name, FG, "left")