mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1281] Unlocked screen fix+ (#556)

Browse Source 
* Dolphin app: fix "Unlocked" popup  timeout on menu enter

* FL-1404: fix word wrap index
This commit is contained in:
its your bedtime 2021-07-02 14:30:30 +03:00 committed by GitHub
parent 6c9be3755c
commit c388458462
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
applications/dolphin/dolphin.c
View File

@ -110,8 +110,15 @@ bool dolphin_view_idle_main_input(InputEvent* event, void* context) {
// unlocked // unlocked
if(!dolphin->locked) { if(!dolphin->locked) {
if(event->key == InputKeyOk && event->type == InputTypeShort) { if(event->key == InputKeyOk && event->type == InputTypeShort) {
with_view_model(
dolphin->idle_view_main, (DolphinViewMainModel * model) {
model->hint_timeout = 0; // clear hint timeout
return true;
});
with_value_mutex( with_value_mutex(
dolphin->menu_vm, (Menu * menu) { menu_ok(menu); }); dolphin->menu_vm, (Menu * menu) { menu_ok(menu); });
} else if(event->key == InputKeyUp && event->type == InputTypeShort) { } else if(event->key == InputKeyUp && event->type == InputTypeShort) {
osTimerStart(dolphin->timeout_timer, 40); osTimerStart(dolphin->timeout_timer, 40);
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewLockMenu); view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewLockMenu);

2
applications/gui/elements.c
View File

@ -236,7 +236,7 @@ void elements_multiline_text_aligned(
string_t buff; string_t buff;
string_init_set(buff, str); string_init_set(buff, str);
size_t s_len = string_size(str); size_t s_len = string_size(str);
uint8_t end_pos = s_len - ((len_px - px_left) / (len_px / s_len) + 2); uint8_t end_pos = s_len - ((len_px - px_left) / (len_px / s_len) + 5);
string_left(buff, end_pos); string_left(buff, end_pos);
string_cat(buff, "-"); string_cat(buff, "-");