Skip to content

Commit d8a648e

Browse files
committed
fix: fix touchIcon hidden logic
1 parent 4afa85f commit d8a648e

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

eez-ui/gaggimate.eez-project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"objID": "9aa0827d-621a-4d16-c9c6-b9647d15bfab",
138138
"name": "system",
139139
"type": "struct:SystemStatus",
140-
"defaultValue": "{ bluetooth: true, update_available: true, wifi: true, error: false, error_label: \"Mammamia\", volumetric_available: true, pressure_available: true, mode: 1, standby_analog_clock : 11, standby_digital_clock : 0, standby_binary_clock : false, standby_logo: true, standby_status : true, standby_mode : 0, standby_touch_icon : true}",
140+
"defaultValue": "{ bluetooth: true, update_available: true, wifi: true, error: false, error_label: \"Mammamia\", volumetric_available: true, pressure_available: true, mode: 1, standby_analog_clock : 11, standby_digital_clock : 0, standby_binary_clock : false, standby_logo: true, standby_status : true, standby_mode : 0, standby_touch_icon : false}",
141141
"persistent": false,
142142
"native": false
143143
},
@@ -1729,7 +1729,7 @@
17291729
"heightUnit": "content",
17301730
"children": [],
17311731
"widgetFlags": "",
1732-
"hiddenFlag": "system.error && !system.standby_touch_icon",
1732+
"hiddenFlag": "system.error || !system.standby_touch_icon",
17331733
"hiddenFlagType": "expression",
17341734
"clickableFlag": false,
17351735
"clickableFlagType": "literal",

src/display/ui/default/eez/ui.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ const uint8_t assets[37788] = {
360360
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
361361
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
362362
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
363-
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
363+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
364364
0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
365365
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00,
366366
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00,
@@ -1694,7 +1694,7 @@ const uint8_t assets[37788] = {
16941694
0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
16951695
0x00, 0xE0, 0x00, 0x00, 0x03, 0x60, 0x0F, 0x00, 0x00, 0xA0, 0x15, 0xC0, 0x00, 0xE0, 0x00, 0x00,
16961696
0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x03, 0x60, 0x09, 0x00,
1697-
0x00, 0xA0, 0x03, 0x60, 0x10, 0x00, 0x00, 0xA0, 0x15, 0xC0, 0x10, 0xC0, 0x00, 0xE0, 0x00, 0x00,
1697+
0x00, 0xA0, 0x03, 0x60, 0x10, 0x00, 0x00, 0xA0, 0x15, 0xC0, 0x11, 0xC0, 0x00, 0xE0, 0x00, 0x00,
16981698
0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x03, 0x60, 0x09, 0x00,
16991699
0x00, 0xA0, 0x03, 0x60, 0x11, 0x00, 0x00, 0xA0, 0x15, 0xC0, 0x10, 0xC0, 0x00, 0xE0, 0x00, 0x00,
17001700
0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x03, 0x60, 0x02, 0x00,

temp_gaggimate_container.zip

1.12 MB
Binary file not shown.

0 commit comments

Comments
 (0)