ソースを参照

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

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

* FL-1404: fix word wrap index
its your bedtime 4 年 前
コミット
c388458462
2 ファイル変更8 行追加1 行削除
  1. 7 0
      applications/dolphin/dolphin.c
  2. 1 1
      applications/gui/elements.c

+ 7 - 0
applications/dolphin/dolphin.c

@@ -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);

+ 1 - 1
applications/gui/elements.c

@@ -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, "-");