Cosmetics
This commit is contained in:
@@ -496,7 +496,7 @@ extern uint8_t warningInfoFlags;
|
|||||||
#define SET_WARNING_INFO(info, len, flags) (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
|
#define SET_WARNING_INFO(info, len, flags) (warningInfoText = info, warningInfoLength = len, warningInfoFlags = flags)
|
||||||
|
|
||||||
#define POPUP_MENU_ADD_ITEM(s) do { popupMenuOffsetType = MENU_OFFSET_INTERNAL; if (popupMenuItemsCount < POPUP_MENU_MAX_LINES) popupMenuItems[popupMenuItemsCount++] = s; } while (0)
|
#define POPUP_MENU_ADD_ITEM(s) do { popupMenuOffsetType = MENU_OFFSET_INTERNAL; if (popupMenuItemsCount < POPUP_MENU_MAX_LINES) popupMenuItems[popupMenuItemsCount++] = s; } while (0)
|
||||||
#define POPUP_MENU_SELECT_ITEM(s) s_menu_item = (s > 0 ? (s < popupMenuItemsCount ? s : popupMenuItemsCount) : 0)
|
#define POPUP_MENU_SELECT_ITEM(s) popupMenuSelectedItem = (s > 0 ? (s < popupMenuItemsCount ? s : popupMenuItemsCount - 1) : 0)
|
||||||
#define POPUP_MENU_START(func) do { popupMenuHandler = (func); AUDIO_KEY_PRESS(); } while(0)
|
#define POPUP_MENU_START(func) do { popupMenuHandler = (func); AUDIO_KEY_PRESS(); } while(0)
|
||||||
#define POPUP_MENU_MAX_LINES 12
|
#define POPUP_MENU_MAX_LINES 12
|
||||||
#define MENU_MAX_DISPLAY_LINES 9
|
#define MENU_MAX_DISPLAY_LINES 9
|
||||||
@@ -510,7 +510,7 @@ enum {
|
|||||||
MENU_OFFSET_EXTERNAL
|
MENU_OFFSET_EXTERNAL
|
||||||
};
|
};
|
||||||
extern uint8_t popupMenuOffsetType;
|
extern uint8_t popupMenuOffsetType;
|
||||||
extern uint8_t s_menu_item;
|
extern uint8_t popupMenuSelectedItem;
|
||||||
const char * runPopupMenu(event_t event);
|
const char * runPopupMenu(event_t event);
|
||||||
extern void (*popupMenuHandler)(const char * result);
|
extern void (*popupMenuHandler)(const char * result);
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ uint8_t warningResult = 0;
|
|||||||
uint8_t warningInfoFlags = ZCHAR;
|
uint8_t warningInfoFlags = ZCHAR;
|
||||||
void (*popupFunc)(event_t event) = NULL;
|
void (*popupFunc)(event_t event) = NULL;
|
||||||
const char *popupMenuItems[POPUP_MENU_MAX_LINES];
|
const char *popupMenuItems[POPUP_MENU_MAX_LINES];
|
||||||
uint8_t s_menu_item = 0;
|
uint8_t popupMenuSelectedItem = 0;
|
||||||
uint16_t popupMenuItemsCount = 0;
|
uint16_t popupMenuItemsCount = 0;
|
||||||
uint16_t popupMenuOffset = 0;
|
uint16_t popupMenuOffset = 0;
|
||||||
uint8_t popupMenuOffsetType = MENU_OFFSET_INTERNAL;
|
uint8_t popupMenuOffsetType = MENU_OFFSET_INTERNAL;
|
||||||
@@ -102,15 +102,15 @@ const char * runPopupMenu(event_t event)
|
|||||||
|
|
||||||
switch (event) {
|
switch (event) {
|
||||||
case EVT_ROTARY_LEFT:
|
case EVT_ROTARY_LEFT:
|
||||||
if (s_menu_item > 0) {
|
if (popupMenuSelectedItem > 0) {
|
||||||
s_menu_item--;
|
popupMenuSelectedItem--;
|
||||||
}
|
}
|
||||||
else if (popupMenuOffset > 0) {
|
else if (popupMenuOffset > 0) {
|
||||||
popupMenuOffset--;
|
popupMenuOffset--;
|
||||||
result = STR_UPDATE_LIST;
|
result = STR_UPDATE_LIST;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
s_menu_item = min<uint8_t>(display_count, MENU_MAX_DISPLAY_LINES) - 1;
|
popupMenuSelectedItem = min<uint8_t>(display_count, MENU_MAX_DISPLAY_LINES) - 1;
|
||||||
if (popupMenuItemsCount > MENU_MAX_DISPLAY_LINES) {
|
if (popupMenuItemsCount > MENU_MAX_DISPLAY_LINES) {
|
||||||
popupMenuOffset = popupMenuItemsCount - MENU_MAX_DISPLAY_LINES;
|
popupMenuOffset = popupMenuItemsCount - MENU_MAX_DISPLAY_LINES;
|
||||||
result = STR_UPDATE_LIST;
|
result = STR_UPDATE_LIST;
|
||||||
@@ -119,15 +119,15 @@ const char * runPopupMenu(event_t event)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case EVT_ROTARY_RIGHT:
|
case EVT_ROTARY_RIGHT:
|
||||||
if (s_menu_item < display_count - 1 && popupMenuOffset + s_menu_item + 1 < popupMenuItemsCount) {
|
if (popupMenuSelectedItem < display_count - 1 && popupMenuOffset + popupMenuSelectedItem + 1 < popupMenuItemsCount) {
|
||||||
s_menu_item++;
|
popupMenuSelectedItem++;
|
||||||
}
|
}
|
||||||
else if (popupMenuItemsCount > popupMenuOffset + display_count) {
|
else if (popupMenuItemsCount > popupMenuOffset + display_count) {
|
||||||
popupMenuOffset++;
|
popupMenuOffset++;
|
||||||
result = STR_UPDATE_LIST;
|
result = STR_UPDATE_LIST;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
s_menu_item = 0;
|
popupMenuSelectedItem = 0;
|
||||||
if (popupMenuOffset) {
|
if (popupMenuOffset) {
|
||||||
popupMenuOffset = 0;
|
popupMenuOffset = 0;
|
||||||
result = STR_UPDATE_LIST;
|
result = STR_UPDATE_LIST;
|
||||||
@@ -136,12 +136,12 @@ const char * runPopupMenu(event_t event)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case EVT_KEY_BREAK(KEY_ENTER):
|
case EVT_KEY_BREAK(KEY_ENTER):
|
||||||
result = popupMenuItems[s_menu_item + (popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)];
|
result = popupMenuItems[popupMenuSelectedItem + (popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)];
|
||||||
// no break
|
// no break
|
||||||
|
|
||||||
case EVT_KEY_BREAK(KEY_EXIT):
|
case EVT_KEY_BREAK(KEY_EXIT):
|
||||||
popupMenuItemsCount = 0;
|
popupMenuItemsCount = 0;
|
||||||
s_menu_item = 0;
|
popupMenuSelectedItem = 0;
|
||||||
popupMenuOffset = 0;
|
popupMenuOffset = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -152,7 +152,7 @@ const char * runPopupMenu(event_t event)
|
|||||||
lcdDrawSolidRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2, 1, ALARM_COLOR);
|
lcdDrawSolidRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2, 1, ALARM_COLOR);
|
||||||
|
|
||||||
for (uint8_t i=0; i<display_count; i++) {
|
for (uint8_t i=0; i<display_count; i++) {
|
||||||
if (i == s_menu_item) {
|
if (i == popupMenuSelectedItem) {
|
||||||
lcdDrawSolidFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, FH+1, TEXT_INVERTED_BGCOLOR);
|
lcdDrawSolidFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, FH+1, TEXT_INVERTED_BGCOLOR);
|
||||||
lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], TEXT_INVERTED_COLOR);
|
lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], TEXT_INVERTED_COLOR);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ uint8_t popupMenuOffsetType = MENU_OFFSET_INTERNAL;
|
|||||||
void (* popupFunc)(event_t event) = NULL;
|
void (* popupFunc)(event_t event) = NULL;
|
||||||
|
|
||||||
const char * popupMenuItems[POPUP_MENU_MAX_LINES];
|
const char * popupMenuItems[POPUP_MENU_MAX_LINES];
|
||||||
uint8_t s_menu_item = 0;
|
uint8_t popupMenuSelectedItem = 0;
|
||||||
uint16_t popupMenuItemsCount = 0;
|
uint16_t popupMenuItemsCount = 0;
|
||||||
uint16_t popupMenuOffset = 0;
|
uint16_t popupMenuOffset = 0;
|
||||||
void (* popupMenuHandler)(const char * result);
|
void (* popupMenuHandler)(const char * result);
|
||||||
@@ -85,7 +85,7 @@ const char * runPopupMenu(event_t event)
|
|||||||
// items
|
// items
|
||||||
for (uint8_t i=0; i<display_count; i++) {
|
for (uint8_t i=0; i<display_count; i++) {
|
||||||
lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], 0);
|
lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], 0);
|
||||||
if (i == s_menu_item) lcdDrawSolidFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, 9);
|
if (i == popupMenuSelectedItem) lcdDrawSolidFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, 9);
|
||||||
}
|
}
|
||||||
|
|
||||||
// scrollbar
|
// scrollbar
|
||||||
@@ -99,8 +99,8 @@ const char * runPopupMenu(event_t event)
|
|||||||
#endif
|
#endif
|
||||||
case EVT_KEY_FIRST(KEY_UP):
|
case EVT_KEY_FIRST(KEY_UP):
|
||||||
case EVT_KEY_REPT(KEY_UP):
|
case EVT_KEY_REPT(KEY_UP):
|
||||||
if (s_menu_item > 0) {
|
if (popupMenuSelectedItem > 0) {
|
||||||
s_menu_item--;
|
popupMenuSelectedItem--;
|
||||||
}
|
}
|
||||||
#if defined(SDCARD)
|
#if defined(SDCARD)
|
||||||
else if (popupMenuOffset > 0) {
|
else if (popupMenuOffset > 0) {
|
||||||
@@ -109,7 +109,7 @@ const char * runPopupMenu(event_t event)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else {
|
else {
|
||||||
s_menu_item = min<uint8_t>(display_count, MENU_MAX_DISPLAY_LINES) - 1;
|
popupMenuSelectedItem = min<uint8_t>(display_count, MENU_MAX_DISPLAY_LINES) - 1;
|
||||||
#if defined(SDCARD)
|
#if defined(SDCARD)
|
||||||
if (popupMenuItemsCount > MENU_MAX_DISPLAY_LINES) {
|
if (popupMenuItemsCount > MENU_MAX_DISPLAY_LINES) {
|
||||||
popupMenuOffset = popupMenuItemsCount - display_count;
|
popupMenuOffset = popupMenuItemsCount - display_count;
|
||||||
@@ -124,8 +124,8 @@ const char * runPopupMenu(event_t event)
|
|||||||
#endif
|
#endif
|
||||||
case EVT_KEY_FIRST(KEY_DOWN):
|
case EVT_KEY_FIRST(KEY_DOWN):
|
||||||
case EVT_KEY_REPT(KEY_DOWN):
|
case EVT_KEY_REPT(KEY_DOWN):
|
||||||
if (s_menu_item < display_count - 1 && popupMenuOffset + s_menu_item + 1 < popupMenuItemsCount) {
|
if (popupMenuSelectedItem < display_count - 1 && popupMenuOffset + popupMenuSelectedItem + 1 < popupMenuItemsCount) {
|
||||||
s_menu_item++;
|
popupMenuSelectedItem++;
|
||||||
}
|
}
|
||||||
#if defined(SDCARD)
|
#if defined(SDCARD)
|
||||||
else if (popupMenuItemsCount > popupMenuOffset + display_count) {
|
else if (popupMenuItemsCount > popupMenuOffset + display_count) {
|
||||||
@@ -134,7 +134,7 @@ const char * runPopupMenu(event_t event)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else {
|
else {
|
||||||
s_menu_item = 0;
|
popupMenuSelectedItem = 0;
|
||||||
#if defined(SDCARD)
|
#if defined(SDCARD)
|
||||||
if (popupMenuOffset) {
|
if (popupMenuOffset) {
|
||||||
popupMenuOffset = 0;
|
popupMenuOffset = 0;
|
||||||
@@ -145,9 +145,9 @@ const char * runPopupMenu(event_t event)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case EVT_KEY_BREAK(KEY_ENTER):
|
case EVT_KEY_BREAK(KEY_ENTER):
|
||||||
result = popupMenuItems[s_menu_item + (popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)];
|
result = popupMenuItems[popupMenuSelectedItem + (popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)];
|
||||||
popupMenuItemsCount = 0;
|
popupMenuItemsCount = 0;
|
||||||
s_menu_item = 0;
|
popupMenuSelectedItem = 0;
|
||||||
popupMenuOffset = 0;
|
popupMenuOffset = 0;
|
||||||
popupMenuTitle = nullptr;
|
popupMenuTitle = nullptr;
|
||||||
break;
|
break;
|
||||||
@@ -155,7 +155,7 @@ const char * runPopupMenu(event_t event)
|
|||||||
case EVT_KEY_BREAK(KEY_EXIT):
|
case EVT_KEY_BREAK(KEY_EXIT):
|
||||||
result = STR_EXIT;
|
result = STR_EXIT;
|
||||||
popupMenuItemsCount = 0;
|
popupMenuItemsCount = 0;
|
||||||
s_menu_item = 0;
|
popupMenuSelectedItem = 0;
|
||||||
popupMenuOffset = 0;
|
popupMenuOffset = 0;
|
||||||
popupMenuTitle = nullptr;
|
popupMenuTitle = nullptr;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ extern uint16_t popupMenuItemsCount;
|
|||||||
typedef void (* PopupMenuHandler)(const char * result);
|
typedef void (* PopupMenuHandler)(const char * result);
|
||||||
extern PopupMenuHandler popupMenuHandler;
|
extern PopupMenuHandler popupMenuHandler;
|
||||||
extern const char * popupMenuTitle;
|
extern const char * popupMenuTitle;
|
||||||
extern uint8_t s_menu_item;
|
extern uint8_t popupMenuSelectedItem;
|
||||||
|
|
||||||
// Message box
|
// Message box
|
||||||
void drawMessageBoxBackground(coord_t top, coord_t height);
|
void drawMessageBoxBackground(coord_t top, coord_t height);
|
||||||
@@ -156,7 +156,7 @@ inline void POPUP_MENU_ADD_ITEM(const char * s)
|
|||||||
|
|
||||||
inline void POPUP_MENU_SELECT_ITEM(uint8_t index)
|
inline void POPUP_MENU_SELECT_ITEM(uint8_t index)
|
||||||
{
|
{
|
||||||
s_menu_item = (index > 0 ? (index < popupMenuItemsCount ? index : popupMenuItemsCount) : 0);
|
popupMenuSelectedItem = (index > 0 ? (index < popupMenuItemsCount ? index : popupMenuItemsCount) : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void POPUP_MENU_START(PopupMenuHandler handler)
|
inline void POPUP_MENU_START(PopupMenuHandler handler)
|
||||||
|
|||||||
Reference in New Issue
Block a user