From fdaed515fc4d1b70a04744a2b47140399cec41b3 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 18 Feb 2019 18:40:21 +0100
Subject: [PATCH] X3 UI fixes

---
 radio/src/gui/128x64/gui.h                      | 8 ++++----
 radio/src/gui/common/stdlcd/radio_sdmanager.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h
index da65a514c..cd794dd0e 100644
--- a/radio/src/gui/128x64/gui.h
+++ b/radio/src/gui/128x64/gui.h
@@ -27,7 +27,7 @@
 
 #define MENUS_SCROLLBAR_WIDTH          0
 
-#if defined(PCBX7)
+#if defined(PCBX7) || defined(PCBX3)
   #define HEADER_LINE                  0
   #define HEADER_LINE_COLUMNS
 #else
@@ -157,7 +157,7 @@ void title(const char * s);
 
 #define MENU_TAB(...) const uint8_t mstate_tab[] = __VA_ARGS__
 
-#if defined(PCBX7)
+#if defined(PCBX7) || defined(PCBX3)
 #define MENU_CHECK(tab, menu, lines_count) \
   check(event, menu, tab, DIM(tab), mstate_tab, DIM(mstate_tab)-1, lines_count)
 #else
@@ -170,7 +170,7 @@ void title(const char * s);
   MENU_CHECK(tab, menu, lines_count); \
   TITLE(title)
 
-#if defined(PCBX7)
+#if defined(PCBX7) || defined(PCBX3)
 #define SIMPLE_MENU_NOTITLE(tab, menu, lines_count) \
   check_simple(event, menu, tab, DIM(tab), lines_count);
 #define SUBMENU_NOTITLE(lines_count, ...) { \
@@ -323,7 +323,7 @@ void drawStatusLine();
 #endif
 
 // TODO enum
-#if defined(PCBX7)
+#if defined(PCBX7) || defined(PCBX3)
 #define EDIT_MODE_INIT                 0
 #else
 #define EDIT_MODE_INIT                 -1
diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
index b89cd74f4..1807b8ab3 100644
--- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
+++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp
@@ -197,7 +197,7 @@ void menuRadioSdManager(event_t _event)
       menuVerticalOffset = reusableBuffer.sdmanager.offset;
       break;
 
-#if defined(PCBX9) || defined(PCBX7) // TODO NO_MENU_KEY
+#if defined(PCBX9) || defined(PCBX7) || defined(PCBX3) // TODO NO_MENU_KEY
     case EVT_KEY_LONG(KEY_MENU):
       if (!READ_ONLY() && s_editMode == 0) {
         killEvents(_event);
@@ -234,7 +234,7 @@ void menuRadioSdManager(event_t _event)
       break;
 
     case EVT_KEY_LONG(KEY_ENTER):
-#if !defined(PCBX9) && !defined(PCBX7) // TODO NO_HEADER_LINE
+#if !defined(PCBX9) && !defined(PCBX7) && !defined(PCBX3)// TODO NO_HEADER_LINE
       if (menuVerticalPosition < HEADER_LINE) {
         killEvents(_event);
         POPUP_MENU_ADD_ITEM(STR_SD_INFO);