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

Merge branch 'dev' into blegatt_refactor_merge

Browse Source
This commit is contained in:
MX
2023-09-12 19:20:03 +03:00
parent 091210c003 6a2adf69e6
commit 4d3a3070e4
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/main/subghz/scenes/subghz_scene_receiver_config.c
View File

@@ -11,6 +11,7 @@ enum SubGhzSettingIndex {
SubGhzSettingIndexIgnoreStarline,
SubGhzSettingIndexIgnoreCars,
SubGhzSettingIndexIgnoreMagellan,
SubGhzSettingIndexIgnorePrinceton,
SubGhzSettingIndexSound,
SubGhzSettingIndexResetToDefault,
SubGhzSettingIndexLock,

19
applications/services/gui/modules/variable_item_list.c
View File

@@ -79,24 +79,37 @@ static void variable_item_list_draw_callback(Canvas* canvas, void* _model) {
canvas_set_color(canvas, ColorBlack);
}
uint8_t temp_x_default = 73;
uint8_t temp_w_default = 66;
if(item->current_value_index == 0 && furi_string_empty(item->current_value_text)) {
// Only left text, no right text
canvas_draw_str(canvas, 6, item_text_y, item->label);
} else {
if(furi_string_size(item->current_value_text) < (size_t)4) {
temp_x_default = 80;
temp_w_default = 71;
}
elements_scrollable_text_line_str(
canvas, 6, item_text_y, 66, item->label, scroll_counter, false, false);
canvas,
6,
item_text_y,
temp_w_default,
item->label,
scroll_counter,
false,
false);
}
if(item->locked) {
canvas_draw_icon(canvas, 110, item_text_y - 8, &I_Lock_7x8);
} else {
if(item->current_value_index > 0) {
canvas_draw_str(canvas, 73, item_text_y, "<");
canvas_draw_str(canvas, temp_x_default, item_text_y, "<");
}
elements_scrollable_text_line_str(
canvas,
(115 + 73) / 2 + 1,
(115 + temp_x_default) / 2 + 1,
item_text_y,
37,
furi_string_get_cstr(item->current_value_text),