Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-06-23 06:14:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

RDS Radiotext should make receiver happier (missing end char)

Browse source 
String-ized text entry
This commit is contained in:
furrtek 2017-04-18 18:12:32 +01:00
parent 62b90942ac
commit 555201b780
24 changed files with 138 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

12
firmware/application/ui_handwrite.cpp
View file

@ -38,7 +38,7 @@ void HandWriteView::paint(Painter& painter) {
HandWriteView::HandWriteView(
NavigationView& nav,
char txt[],
std::string& txt,
size_t max_length
) : _max_length(max_length)
{
@ -48,8 +48,8 @@ HandWriteView::HandWriteView(
// Handwriting alphabet definition here
handwriting = &handwriting_unistroke;
txtidx = strlen(txt);
memcpy(txtinput, txt, _max_length + 1);
txtidx = txt.length();
txtinput = txt;
n = txtidx;
while (n && (txtinput[n - 1] == ' ')) {
txtinput[--n] = 0;
@ -110,8 +110,8 @@ HandWriteView::HandWriteView(
}
};
button_ok.on_select = [this, &nav, txt, max_length](Button&) {
memcpy(txt, txtinput, max_length + 1);
button_ok.on_select = [this, &nav, &txt, max_length](Button&) {
txt = txtinput;
if (on_changed) on_changed(this->value());
nav.pop();
};
@ -382,7 +382,7 @@ void HandWriteView::on_show() {
clear_zone(Color::black(), false);
}
char * HandWriteView::value() {
std::string HandWriteView::value() {
txtinput[txtidx] = 0;
return txtinput;
}