Skip to content

Commit 15e18f6

Browse files
committed
Hotfix: keep alignment of memory values to the right to avoid breaking other themes
Alignment could be specified in theme.yaml for a future version
1 parent e4c75e6 commit 15e18f6

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

library/stats.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,9 @@ def stats():
428428
if THEME_DATA['STATS']['MEMORY']['VIRTUAL']['USED'].get("SHOW", False):
429429
virtual_used = sensors.Memory.virtual_used()
430430

431-
virtual_used_text = f"{int(virtual_used / 1000000)}"
431+
virtual_used_text = f"{int(virtual_used / 1000000):>5}"
432432
if THEME_DATA['STATS']['MEMORY']['VIRTUAL']['USED'].get("SHOW_UNIT", True):
433433
virtual_used_text += " M"
434-
virtual_used_text = f"{virtual_used_text:<8}"
435434

436435
display.lcd.DisplayText(
437436
text=virtual_used_text,
@@ -576,9 +575,9 @@ def stats():
576575
upload_wlo, uploaded_wlo, download_wlo, downloaded_wlo = sensors.Net.stats(WLO_CARD, interval)
577576

578577
if THEME_DATA['STATS']['NET']['WLO']['UPLOAD']['TEXT'].get("SHOW", False):
579-
upload_wlo_text = f"{bytes2human(upload_wlo, '%(value).1f %(symbol)s/s'):>10}"
578+
upload_wlo_text = f"{bytes2human(upload_wlo, '%(value).1f %(symbol)s/s')}"
580579
display.lcd.DisplayText(
581-
text=f"{upload_wlo_text:>9}",
580+
text=f"{upload_wlo_text:>10}",
582581
x=THEME_DATA['STATS']['NET']['WLO']['UPLOAD']['TEXT'].get("X", 0),
583582
y=THEME_DATA['STATS']['NET']['WLO']['UPLOAD']['TEXT'].get("Y", 0),
584583
font=THEME_DATA['STATS']['NET']['WLO']['UPLOAD']['TEXT'].get("FONT",
@@ -612,9 +611,9 @@ def stats():
612611
)
613612

614613
if THEME_DATA['STATS']['NET']['WLO']['DOWNLOAD']['TEXT'].get("SHOW", False):
615-
download_wlo_text = f"{bytes2human(download_wlo, '%(value).1f %(symbol)s/s'):>10}"
614+
download_wlo_text = f"{bytes2human(download_wlo, '%(value).1f %(symbol)s/s')}"
616615
display.lcd.DisplayText(
617-
text=f"{download_wlo_text:>9}",
616+
text=f"{download_wlo_text:>10}",
618617
x=THEME_DATA['STATS']['NET']['WLO']['DOWNLOAD']['TEXT'].get("X", 0),
619618
y=THEME_DATA['STATS']['NET']['WLO']['DOWNLOAD']['TEXT'].get("Y", 0),
620619
font=THEME_DATA['STATS']['NET']['WLO']['DOWNLOAD']['TEXT'].get("FONT",
@@ -650,9 +649,9 @@ def stats():
650649
upload_eth, uploaded_eth, download_eth, downloaded_eth = sensors.Net.stats(ETH_CARD, interval)
651650

652651
if THEME_DATA['STATS']['NET']['ETH']['UPLOAD']['TEXT'].get("SHOW", False):
653-
upload_eth_text = f"{bytes2human(upload_eth, '%(value).1f %(symbol)s/s'):>10}"
652+
upload_eth_text = f"{bytes2human(upload_eth, '%(value).1f %(symbol)s/s')}"
654653
display.lcd.DisplayText(
655-
text=f"{upload_eth_text:>9}",
654+
text=f"{upload_eth_text:>10}",
656655
x=THEME_DATA['STATS']['NET']['ETH']['UPLOAD']['TEXT'].get("X", 0),
657656
y=THEME_DATA['STATS']['NET']['ETH']['UPLOAD']['TEXT'].get("Y", 0),
658657
font=THEME_DATA['STATS']['NET']['ETH']['UPLOAD']['TEXT'].get("FONT",
@@ -686,9 +685,9 @@ def stats():
686685
)
687686

688687
if THEME_DATA['STATS']['NET']['ETH']['DOWNLOAD']['TEXT'].get("SHOW", False):
689-
download_eth_text = f"{bytes2human(download_eth, '%(value).1f %(symbol)s/s'):>10}"
688+
download_eth_text = f"{bytes2human(download_eth, '%(value).1f %(symbol)s/s')}"
690689
display.lcd.DisplayText(
691-
text=f"{download_eth_text:>9}",
690+
text=f"{download_eth_text:>10}",
692691
x=THEME_DATA['STATS']['NET']['ETH']['DOWNLOAD']['TEXT'].get("X", 0),
693692
y=THEME_DATA['STATS']['NET']['ETH']['DOWNLOAD']['TEXT'].get("Y", 0),
694693
font=THEME_DATA['STATS']['NET']['ETH']['DOWNLOAD']['TEXT'].get("FONT",

0 commit comments

Comments
 (0)