[X7D] UI fixes

2016-12-02 18:37:53 +01:00
parent 1d192d9fd2
commit 705823a9a6
19 changed files with 185 additions and 215 deletions
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "opentx.h"
+
+#if defined(CPUARM)
+uint8_t popupMenuOffsetType = MENU_OFFSET_INTERNAL;
+void (*popupFunc)(event_t event) = NULL;
+#endif
+
+#if defined(NAVIGATION_MENUS)
+const char * popupMenuItems[POPUP_MENU_MAX_LINES];
+uint8_t s_menu_item = 0;
+uint16_t popupMenuNoItems = 0;
+uint8_t popupMenuFlags = 0;
+uint16_t popupMenuOffset = 0;
+void (*popupMenuHandler)(const char * result);
+
+const char * runPopupMenu(event_t event)
+{
+  const char * result = NULL;
+
+  uint8_t display_count = min<uint8_t>(popupMenuNoItems, MENU_MAX_DISPLAY_LINES);
+  uint8_t y = (display_count >= 5 ? MENU_Y - FH - 1 : MENU_Y);
+  lcdDrawFilledRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2, SOLID, ERASE);
+  lcdDrawRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2);
+
+  for (uint8_t i=0; i<display_count; i++) {
+#if defined(CPUARM)
+    lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], 0);
+#else
+    lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i], popupMenuFlags);
+#endif
+    if (i == s_menu_item) lcdDrawSolidFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, 9);
+  }
+
+  if (popupMenuNoItems > display_count) {
+    drawVerticalScrollbar(MENU_X+MENU_W-1, y+1, MENU_MAX_DISPLAY_LINES * (FH+1), popupMenuOffset, popupMenuNoItems, display_count);
+  }
+
+  switch (event) {
+#if defined(ROTARY_ENCODER_NAVIGATION)
+    CASE_EVT_ROTARY_LEFT
+#endif
+    case EVT_KEY_FIRST(KEY_UP):
+    case EVT_KEY_REPT(KEY_UP):
+      if (s_menu_item > 0) {
+        s_menu_item--;
+      }
+#if defined(SDCARD)
+      else if (popupMenuOffset > 0) {
+        popupMenuOffset--;
+        result = STR_UPDATE_LIST;
+      }
+#endif
+      else {
+#if defined(CPUARM)
+        s_menu_item = min<uint8_t>(display_count, MENU_MAX_DISPLAY_LINES) - 1;
+#else
+        s_menu_item = display_count - 1;
+#endif
+#if defined(SDCARD)
+        if (popupMenuNoItems > MENU_MAX_DISPLAY_LINES) {
+          popupMenuOffset = popupMenuNoItems - display_count;
+          result = STR_UPDATE_LIST;
+        }
+#endif
+      }
+      break;
+
+#if defined(ROTARY_ENCODER_NAVIGATION)
+    CASE_EVT_ROTARY_RIGHT
+#endif
+    case EVT_KEY_FIRST(KEY_DOWN):
+    case EVT_KEY_REPT(KEY_DOWN):
+      if (s_menu_item < display_count - 1 && popupMenuOffset + s_menu_item + 1 < popupMenuNoItems) {
+        s_menu_item++;
+      }
+#if defined(SDCARD)
+      else if (popupMenuNoItems > popupMenuOffset + display_count) {
+        popupMenuOffset++;
+        result = STR_UPDATE_LIST;
+      }
+#endif
+      else {
+        s_menu_item = 0;
+#if defined(SDCARD)
+        if (popupMenuOffset) {
+          popupMenuOffset = 0;
+          result = STR_UPDATE_LIST;
+        }
+#endif
+      }
+      break;
+
+#if defined(ROTARY_ENCODER_NAVIGATION)
+    CASE_EVT_ROTARY_BREAK
+#endif
+    case EVT_KEY_BREAK(KEY_ENTER):
+#if defined(CPUARM)
+      result = popupMenuItems[s_menu_item + (popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)];
+#else
+      result = popupMenuItems[s_menu_item];
+#endif
+      // no break
+
+#if defined(ROTARY_ENCODER_NAVIGATION)
+    CASE_EVT_ROTARY_LONG
+      killEvents(event);
+      // no break
+#endif
+      
+    case EVT_KEY_BREAK(KEY_EXIT):
+      popupMenuNoItems = 0;
+      s_menu_item = 0;
+      popupMenuFlags = 0;
+      popupMenuOffset = 0;
+      break;
+  }
+
+  return result;
+}
+#endif