Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-26 01:35:16 +03:00
Code Activity

X3 UI fixes

Browse source
This commit is contained in:
Bertrand Songis 2019-02-18 18:40:21 +01:00
parent 45df511b26
commit fdaed515fc
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/gui/128x64/gui.h
View file

@ -27,7 +27,7 @@
#define MENUS_SCROLLBAR_WIDTH 0 #define MENUS_SCROLLBAR_WIDTH 0
#if defined(PCBX7) #if defined(PCBX7) || defined(PCBX3)
#define HEADER_LINE 0 #define HEADER_LINE 0
#define HEADER_LINE_COLUMNS #define HEADER_LINE_COLUMNS
#else #else
@ -157,7 +157,7 @@ void title(const char * s);
#define MENU_TAB(...) const uint8_t mstate_tab[] = __VA_ARGS__ #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) \ #define MENU_CHECK(tab, menu, lines_count) \
check(event, menu, tab, DIM(tab), mstate_tab, DIM(mstate_tab)-1, lines_count) check(event, menu, tab, DIM(tab), mstate_tab, DIM(mstate_tab)-1, lines_count)
#else #else
@ -170,7 +170,7 @@ void title(const char * s);
MENU_CHECK(tab, menu, lines_count); \ MENU_CHECK(tab, menu, lines_count); \
TITLE(title) TITLE(title)
#if defined(PCBX7) #if defined(PCBX7) || defined(PCBX3)
#define SIMPLE_MENU_NOTITLE(tab, menu, lines_count) \ #define SIMPLE_MENU_NOTITLE(tab, menu, lines_count) \
check_simple(event, menu, tab, DIM(tab), lines_count); check_simple(event, menu, tab, DIM(tab), lines_count);
#define SUBMENU_NOTITLE(lines_count, ...) { \ #define SUBMENU_NOTITLE(lines_count, ...) { \
@ -323,7 +323,7 @@ void drawStatusLine();
#endif #endif
// TODO enum // TODO enum
#if defined(PCBX7) #if defined(PCBX7) || defined(PCBX3)
#define EDIT_MODE_INIT 0 #define EDIT_MODE_INIT 0
#else #else
#define EDIT_MODE_INIT -1 #define EDIT_MODE_INIT -1

4
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
View file

@ -197,7 +197,7 @@ void menuRadioSdManager(event_t _event)
menuVerticalOffset = reusableBuffer.sdmanager.offset; menuVerticalOffset = reusableBuffer.sdmanager.offset;
break; 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): case EVT_KEY_LONG(KEY_MENU):
if (!READ_ONLY() && s_editMode == 0) { if (!READ_ONLY() && s_editMode == 0) {
killEvents(_event); killEvents(_event);
@ -234,7 +234,7 @@ void menuRadioSdManager(event_t _event)
break; break;
case EVT_KEY_LONG(KEY_ENTER): 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) { if (menuVerticalPosition < HEADER_LINE) {
killEvents(_event); killEvents(_event);
POPUP_MENU_ADD_ITEM(STR_SD_INFO); POPUP_MENU_ADD_ITEM(STR_SD_INFO);