piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(bw): switch display may overlap other elements if switches are disabled (#6077)

Browse Source
This commit is contained in:
philmoz
2025-04-13 08:13:47 +10:00
committed by GitHub
parent 9afa0c2a3a
commit 8cde54b2e6
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/view_main.cpp
+3 -10
View File
@@ -517,17 +517,10 @@ void menuMainView(event_t event)
// Switches
// -> 2 columns: one for each side
// -> 4 slots on each side (3 normal / 1 small)
// -> 4 slots on each side
uint8_t switches = switchGetMaxSwitches();
uint8_t configured_switches = 0;
for (uint8_t i = 0; i < switches; i++) {
if (SWITCH_EXISTS(i) && !switchIsFlex(i)) {
configured_switches ++;
}
}
if (configured_switches < 7) {
if (switches < 7) {
for (int i = 0; i < switches; ++i) {
if (SWITCH_EXISTS(i) && !switchIsFlex(i)) {
auto switch_display = switchGetDisplayPosition(i);
@@ -547,7 +540,7 @@ void menuMainView(event_t event)
if (SWITCH_EXISTS(i) && !switchIsFlex(i)) {
auto switch_display = switchGetDisplayPosition(i);
coord_t x = (switch_display.col == 0 ? 8 : 96) + switch_display.row * 5;
if (configured_switches < 9) x += 3;
if (switches < 9) x += 3;
drawSmallSwitch(x, 5 * FH + 1, 4, i);
}
}