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

fix(bw): change char selection order when editing names (#5390)

Browse Source
This commit is contained in:
philmoz
2024-08-08 14:51:23 +10:00
committed by GitHub
parent 5e745df8c1
commit eda4e6b9e1
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/draw_functions.cpp
+14 -20
View File
@@ -159,26 +159,18 @@ char getPreviousChar(char c, uint8_t position)
return c - 1;
}
static bool isNameCharset(int v)
static const char nameChars[] = " abcdefghijklmnopqrstuvwxyz0123456789_-,.";
static int nameCharIdx(char v)
{
char c = (char)v;
if (c == ' ')
return true;
if (c == '-')
return true;
if (c >= '0' && c <= '9')
return true;
if (c >= 'A' && c <= 'Z')
return true;
if (c >= 'a' && c <= 'z')
return true;
return false;
if (islower(v)) return v - 'a' + 1;
if (isupper(v)) return v - 'A' + 1;
if (isdigit(v)) return v - '0' + 27;
if (v == '_') return 37;
if (v == '-') return 38;
if (v == ',') return 39;
if (v == '.') return 40;
return 0;
}
void editName(coord_t x, coord_t y, char* name, uint8_t size, event_t event,
@@ -202,7 +194,9 @@ void editName(coord_t x, coord_t y, char* name, uint8_t size, event_t event,
int8_t v = c ? c : ' ';
if (IS_NEXT_EVENT(event) || IS_PREVIOUS_EVENT(event)) {
v = checkIncDec(event, abs(v), ' ', 'z', 0, isNameCharset);
bool caps = isupper(v);
v = nameChars[checkIncDec(event, nameCharIdx(v), 0, DIM(nameChars)-2)];
if (caps && islower(v)) v = toupper(v);
}
switch (event) {