Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 08:45:24 +03:00
Code Issues Wiki Activity

[9XR-PRO] UI Fixes

Browse source
This commit is contained in:
Bertrand Songis 2016-11-14 22:36:04 +01:00
parent 10fe5530f9
commit 06e7e258e8
2 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
View file

@ -242,7 +242,7 @@ void menuRadioSdManager(event_t _event)
return; return;
} }
} }
// no break break;
case EVT_KEY_LONG(KEY_ENTER): case EVT_KEY_LONG(KEY_ENTER):
#if !defined(PCBTARANIS) #if !defined(PCBTARANIS)
@ -254,7 +254,7 @@ void menuRadioSdManager(event_t _event)
break; break;
} }
#endif #endif
if (s_editMode == 0) { if (s_editMode <= 0) {
killEvents(_event); killEvents(_event);
char * line = reusableBuffer.sdmanager.lines[index]; char * line = reusableBuffer.sdmanager.lines[index];
if (!strcmp(line, "..")) { if (!strcmp(line, "..")) {

36
radio/src/gui/common/stdlcd/widgets.cpp
View file

@ -92,19 +92,37 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
s_editMode = EDIT_MODIFY_STRING; s_editMode = EDIT_MODIFY_STRING;
cur = 0; cur = 0;
} }
else if (cur<size-1) else if (cur < size - 1)
cur++; cur++;
else else
s_editMode = 0; s_editMode = 0;
break; break;
#if !defined(PCBTARANIS)
case EVT_KEY_BREAK(KEY_LEFT):
if (cur>0) cur--;
break;
case EVT_KEY_BREAK(KEY_RIGHT):
if (cur<size-1) cur++;
break;
#endif
#if defined(PCBTARANIS)
case EVT_KEY_LONG(KEY_ENTER): case EVT_KEY_LONG(KEY_ENTER):
#else
case EVT_KEY_LONG(KEY_LEFT):
case EVT_KEY_LONG(KEY_RIGHT):
#endif
if (attr & ZCHAR) { if (attr & ZCHAR) {
#if defined(PCBTARANIS)
if (v == 0) { if (v == 0) {
s_editMode = 0; s_editMode = 0;
killEvents(event); killEvents(event);
} }
else if (v>=-26 && v<=26) { #endif
if (v >= -26 && v <= 26) {
v = -v; // toggle case v = -v; // toggle case
} }
} }
@ -114,13 +132,17 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
killEvents(event); killEvents(event);
break; break;
} }
else if (v>='A' && v<='Z') { else if (v >= 'A' && v <= 'Z') {
v = 'a'+v-'A'; // toggle case v = 'a' + v - 'A'; // toggle case
} }
else if (v>='a' && v<='z') { else if (v >= 'a' && v <= 'z') {
v = 'A'+v-'a'; // toggle case v = 'A' + v - 'a'; // toggle case
} }
} }
#if !defined(PCBTARANIS)
if (event==EVT_KEY_LONG(KEY_LEFT))
killEvents(KEY_LEFT);
#endif
break; break;
} }