Skip to content

Commit

Permalink
merge ofw PR 3840 [ci skip]
Browse files Browse the repository at this point in the history
GUI: NumberInput small improvements by Willy-JL
  • Loading branch information
xMasterX committed Aug 17, 2024
1 parent 6a689d2 commit 67dae22
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions applications/services/gui/modules/number_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static void number_input_draw_input(Canvas* canvas, NumberInputModel* model) {
const size_t text_x = 8;
const size_t text_y = 25;

elements_slightly_rounded_frame(canvas, 6, 14, 116, 15);
elements_slightly_rounded_frame(canvas, 4, 14, 120, 15);

canvas_draw_str(canvas, text_x, text_y, furi_string_get_cstr(model->text_buffer));
}
Expand Down Expand Up @@ -206,7 +206,7 @@ static void number_input_add_digit(NumberInputModel* model, char* newChar) {
}
model->current_number = strtol(furi_string_get_cstr(model->text_buffer), NULL, 10);
if(model->current_number == 0) {
furi_string_reset(model->text_buffer);
furi_string_set(model->text_buffer, "0");
}
}

Expand Down Expand Up @@ -417,7 +417,9 @@ void number_input_set_result_callback(
int32_t max_value) {
furi_check(number_input);

current_number = CLAMP(current_number, max_value, min_value);
if(current_number != 0) {
current_number = CLAMP(current_number, max_value, min_value);
}

with_view_model(
number_input->view,
Expand All @@ -426,7 +428,11 @@ void number_input_set_result_callback(
model->callback = callback;
model->callback_context = callback_context;
model->current_number = current_number;
furi_string_printf(model->text_buffer, "%ld", current_number);
if(current_number != 0) {
furi_string_printf(model->text_buffer, "%ld", current_number);
} else {
furi_string_set(model->text_buffer, "");
}
model->min_value = min_value;
model->max_value = max_value;
},
Expand Down

0 comments on commit 67dae22

Please sign in to comment.