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

* 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
2 changed files with 8 additions and 1 deletions

View File

@@ -110,8 +110,15 @@ bool dolphin_view_idle_main_input(InputEvent* event, void* context) {
// unlocked
if(!dolphin->locked) {
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(
dolphin->menu_vm, (Menu * menu) { menu_ok(menu); });
} else if(event->key == InputKeyUp && event->type == InputTypeShort) {
osTimerStart(dolphin->timeout_timer, 40);
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewLockMenu);