Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 15:58:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Dont use temp str for manipulating text input

Browse Source 
by @Willy-JL
This commit is contained in:
MX
2023-05-15 01:29:24 +03:00
parent 575f863942
commit 89c69ed622
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
applications/services/gui/modules/text_input.c
View File

@@ -155,10 +155,9 @@ static void text_input_backspace_cb(TextInputModel* model) {
model->text_buffer[0] = 0; model->text_buffer[0] = 0;
model->cursor_pos = 0; model->cursor_pos = 0;
} else if(model->cursor_pos > 0) { } else if(model->cursor_pos > 0) {
furi_string_set_str(model->temp_str, model->text_buffer); char* move = model->text_buffer + model->cursor_pos;
furi_string_replace_at(model->temp_str, model->cursor_pos - 1, 1, ""); memmove(move - 1, move, strlen(move) + 1);
model->cursor_pos--; model->cursor_pos--;
strcpy(model->text_buffer, furi_string_get_cstr(model->temp_str));
} }
} }
@@ -373,16 +372,16 @@ static void text_input_handle_ok(TextInput* text_input, TextInputModel* model, I
if(shift != (text_length == 0)) { if(shift != (text_length == 0)) {
selected = char_to_uppercase(selected); selected = char_to_uppercase(selected);
} }
const char replace[2] = {selected, 0};
if(model->clear_default_text) { if(model->clear_default_text) {
furi_string_set_str(model->temp_str, replace); model->text_buffer[0] = selected;
model->text_buffer[1] = '\0';
model->cursor_pos = 1; model->cursor_pos = 1;
} else { } else {
furi_string_set_str(model->temp_str, model->text_buffer); char* move = model->text_buffer + model->cursor_pos;
furi_string_replace_at(model->temp_str, model->cursor_pos, 0, replace); memmove(move + 1, move, strlen(move) + 1);
model->text_buffer[model->cursor_pos] = selected;
model->cursor_pos++; model->cursor_pos++;
} }
strcpy(model->text_buffer, furi_string_get_cstr(model->temp_str));
} }
} }
model->clear_default_text = false; model->clear_default_text = false;