gui2: fixed more bugs in layout code. Now basically works!

This commit is contained in:
Martin Preuss
2026-03-11 19:53:19 +01:00
parent f6736c345d
commit 092c667291
10 changed files with 90 additions and 68 deletions

View File

@@ -127,7 +127,7 @@ SensorWatch_Init:
rcall sensorWatchCreateTitleLabel
rcall sensorWatchCreateImageViewer
rcall sensorWatchCreateValueLabel
ret
; @end
@@ -226,7 +226,7 @@ sensorWatchCreateTitleLabel:
mov xl, yl
mov xh, yh
ldi r16, 0
ldi r17, (WIDGET_PACK_CENTER<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
ldi r17, (WIDGET_PACK_CENTER<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) | \
(WIDGET_PACK_CENTER<<WIDGET_PACK_HCONTENT0_BIT) | (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)
bigcall Label_new
pop yh
@@ -310,8 +310,7 @@ SensorWatch_Descriptors:
.dw RESSSOURCE_TXT_UNKNOWN_S, RESSSOURCE_IMG_CLOUD96, 0 ; unknown
.dw RESSSOURCE_TXT_CO2_S, RESSSOURCE_IMG_CLOUD96, 0 ; co2
.dw RESSSOURCE_TXT_TEMP_S, RESSSOURCE_IMG_TEMP96, 2 ; temp
; .dw RESSSOURCE_TXT_HUM_S, RESSSOURCE_IMG_HUMIDITY96, 0 ; hum
.dw RESSSOURCE_TXT_TEMP_S, RESSSOURCE_IMG_HUMIDITY96, 0 ; hum
.dw RESSSOURCE_TXT_HUM_S, RESSSOURCE_IMG_HUMIDITY96, 0 ; hum
#endif