From d41218eb2987fa06f0cd5d5ad8c3fb24706ef380 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 2 Apr 2016 10:46:46 +0400
Subject: [PATCH] [Horus] Improve "setup screens" responsivity feel (actions on
 key press instead of release)

---
 radio/src/gui/horus/screens_setup.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/radio/src/gui/horus/screens_setup.cpp b/radio/src/gui/horus/screens_setup.cpp
index f6ca654bb..dbcf002d0 100644
--- a/radio/src/gui/horus/screens_setup.cpp
+++ b/radio/src/gui/horus/screens_setup.cpp
@@ -89,7 +89,7 @@ bool editZoneOption(coord_t y, const ZoneOption * option, ZoneOptionValue * valu
     else
       lcdDrawTextAtIndex(SCREENS_SETUP_2ND_COLUMN, y, STR_VCSWFUNC, 0, attr); // TODO define
     if (attr) {
-      if (event==EVT_KEY_BREAK(KEY_ENTER)) {
+      if (event==EVT_KEY_FIRST(KEY_ENTER)) {
         s_editMode = 0;
         if (sdListFiles(BITMAPS_PATH, BITMAPS_EXT, sizeof(value->stringValue), value->stringValue, LIST_NONE_SD_FILE)) {
           fileSelectionDone = false;
@@ -230,13 +230,13 @@ bool menuWidgetChoice(evt_t event)
       break;
     }
 
-    case EVT_KEY_BREAK(KEY_EXIT):
+    case EVT_KEY_FIRST(KEY_EXIT):
       delete currentWidget;
       currentContainer->setWidget(currentZone, previousWidget);
       popMenu();
       return false;
 
-    case EVT_KEY_BREAK(KEY_ENTER):
+    case EVT_KEY_FIRST(KEY_ENTER):
       delete previousWidget;
       currentContainer->createWidget(currentZone, registeredWidgets[menuHorizontalPosition]);
       storageDirty(EE_MODEL);
@@ -319,7 +319,8 @@ bool menuWidgetsSetup(evt_t event)
     }
     if (menuVerticalPosition == i) {
       lcdDrawSolidRect(zone.x-padding, zone.y-padding, zone.w+2*padding, zone.h+2*padding, thickness, color);
-      if (event == EVT_KEY_BREAK(KEY_ENTER)) {
+      if (event == EVT_KEY_FIRST(KEY_ENTER)) {
+        killEvents(KEY_ENTER);
         currentZone = menuVerticalPosition;
         currentWidget = currentContainer->getWidget(menuVerticalPosition);
         if (currentWidget) {
@@ -395,7 +396,7 @@ T * editThemeChoice(coord_t x, coord_t y, T * array[], uint8_t count, T * curren
   }
   if (attr && menuHorizontalPosition >= 0) {
     lcdDrawSolidRect(x + (menuHorizontalPosition - menuHorizontalOffset) * 56 - 3, y - 1, 57, 35, 1, TEXT_INVERTED_BGCOLOR);
-    if (event == EVT_KEY_BREAK(KEY_ENTER)) {
+    if (event == EVT_KEY_FIRST(KEY_ENTER)) {
       s_editMode = 0;
       return array[menuHorizontalPosition];
     }
@@ -457,7 +458,7 @@ bool menuScreensTheme(evt_t event)
         else if (index == optionsCount) {
           lcdDrawText(MENUS_MARGIN_LEFT, y, "Top bar");
           drawButton(SCREENS_SETUP_2ND_COLUMN, y, "Setup", attr);
-          if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
+          if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
             currentScreen = customScreens[0];
             currentContainer = topbar;
             pushMenu(menuWidgetsSetup);
@@ -519,6 +520,7 @@ bool menuScreenSetup(int index, evt_t event)
           delete customScreens[index];
           currentScreen = customScreens[index] = factory->create(&g_model.screenData[index].layoutData);
           strncpy(g_model.screenData[index].layoutName, factory->getName(), sizeof(g_model.screenData[index].layoutName));
+          killEvents(KEY_ENTER);
           storageDirty(EE_MODEL);
         }
         break;
@@ -529,7 +531,7 @@ bool menuScreenSetup(int index, evt_t event)
 
       case ITEM_SCREEN_SETUP_WIDGETS_SETUP:
         drawButton(SCREENS_SETUP_2ND_COLUMN, y, "Setup widgets", attr);
-        if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
+        if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
           pushMenu(menuWidgetsSetup);
         }
         break;
@@ -546,7 +548,7 @@ bool menuScreenSetup(int index, evt_t event)
         }
         else if (menuPageCount > 3 && o == optionsCount) {
           drawButton(SCREENS_SETUP_2ND_COLUMN, y, STR_REMOVE_SCREEN, attr);
-          if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
+          if (attr && event == EVT_KEY_LONG(KEY_ENTER)) {
             delete currentScreen;
             if (index != MAX_CUSTOM_SCREENS-1) {
               memmove(&g_model.screenData[index], &g_model.screenData[index + 1], sizeof(CustomScreenData) * (MAX_CUSTOM_SCREENS - index - 1));
@@ -554,6 +556,7 @@ bool menuScreenSetup(int index, evt_t event)
             }
             memset(&g_model.screenData[MAX_CUSTOM_SCREENS-1], 0, sizeof(CustomScreenData));
             customScreens[MAX_CUSTOM_SCREENS-1] = NULL;
+            killEvents(KEY_ENTER);
             chainMenu(menuTabScreensSetup[index > 0 ? index : 1]);
             return false;
           }
@@ -599,10 +602,11 @@ bool menuScreenAdd(evt_t event)
 {
   menuPageCount = updateMainviewsMenu();
 
-  if (event == EVT_KEY_BREAK(KEY_ENTER)) {
+  if (event == EVT_KEY_FIRST(KEY_ENTER)) {
     customScreens[menuPageCount-2] = registeredLayouts[0]->create(&g_model.screenData[menuPageCount-2].layoutData);
     s_editMode = 0;
     menuHorizontalPosition = -1;
+    killEvents(KEY_ENTER);
     return false;
   }