DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-24 13:52:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into eng_dev

Browse Source
This commit is contained in:
MX 2023-09-04 22:40:50 +03:00
commit e6f9563bbc
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,6 +325,7 @@ static void text_input_handle_down(TextInput* text_input, TextInputModel* model)
static void text_input_handle_left(TextInput* text_input, TextInputModel* model) { static void text_input_handle_left(TextInput* text_input, TextInputModel* model) {
UNUSED(text_input); UNUSED(text_input);
if(model->cursor_select) { if(model->cursor_select) {
model->clear_default_text = false;
if(model->cursor_pos > 0) { if(model->cursor_pos > 0) {
model->cursor_pos = CLAMP(model->cursor_pos - 1, strlen(model->text_buffer), 0u); model->cursor_pos = CLAMP(model->cursor_pos - 1, strlen(model->text_buffer), 0u);
} }
@ -338,6 +339,7 @@ static void text_input_handle_left(TextInput* text_input, TextInputModel* model)
static void text_input_handle_right(TextInput* text_input, TextInputModel* model) { static void text_input_handle_right(TextInput* text_input, TextInputModel* model) {
UNUSED(text_input); UNUSED(text_input);
if(model->cursor_select) { if(model->cursor_select) {
model->clear_default_text = false;
model->cursor_pos = CLAMP(model->cursor_pos + 1, strlen(model->text_buffer), 0u); model->cursor_pos = CLAMP(model->cursor_pos + 1, strlen(model->text_buffer), 0u);
} else if(model->selected_column < get_row_size(model->selected_row) - 1) { } else if(model->selected_column < get_row_size(model->selected_row) - 1) {
model->selected_column++; model->selected_column++;
@ -347,7 +349,10 @@ static void text_input_handle_right(TextInput* text_input, TextInputModel* model
} }
static void text_input_handle_ok(TextInput* text_input, TextInputModel* model, InputType type) { static void text_input_handle_ok(TextInput* text_input, TextInputModel* model, InputType type) {
if(model->cursor_select) return; if(model->cursor_select) {
model->clear_default_text = !model->clear_default_text;
return;
}
bool shift = type == InputTypeLong; bool shift = type == InputTypeLong;
bool repeat = type == InputTypeRepeat; bool repeat = type == InputTypeRepeat;
char selected = get_selected_char(model); char selected = get_selected_char(model);