Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 00:05:17 +03:00
Code Issues Wiki Activity

[Horus] Navigation fixes

Browse source
This commit is contained in:
Andre Bernet 2016-04-02 10:38:34 +04:00
parent 9615c98103
commit 788bdfbb09
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/horus/menu_model_telemetry.cpp
View file

@ -505,7 +505,7 @@ bool menuModelTelemetry(evt_t event)
case ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_IGNORE_INSTANCE);
editCheckBox(g_model.ignoreSensorIds, TELEM_COL2, y, attr, event);
g_model.ignoreSensorIds = editCheckBox(g_model.ignoreSensorIds, TELEM_COL2, y, attr, event);
break;
case ITEM_TELEMETRY_RSSI_LABEL:

6
radio/src/gui/horus/view_main.cpp
View file

@ -165,12 +165,12 @@ bool menuMainView(evt_t event)
pushMenu(menuTabScreensSetup[1]);
return false;
case EVT_KEY_BREAK(KEY_PGDN):
case EVT_KEY_FIRST(KEY_PGDN):
storageDirty(EE_GENERAL);
g_eeGeneral.view = circularIncDec(g_eeGeneral.view, +1, 0, getMainViewsCount()-1);
break;
case EVT_KEY_BREAK(KEY_PGUP):
case EVT_KEY_FIRST(KEY_PGUP):
killEvents(event);
storageDirty(EE_GENERAL);
g_eeGeneral.view = circularIncDec(g_eeGeneral.view, -1, 0, getMainViewsCount()-1);
@ -193,6 +193,7 @@ bool menuMainView(evt_t event)
return true;
}
#if 0
bool menuMainViewChannelsMonitor(evt_t event)
{
switch (event) {
@ -204,3 +205,4 @@ bool menuMainViewChannelsMonitor(evt_t event)
return menuChannelsView(event);
}
#endif

8
radio/src/gui/horus/view_text.cpp
View file

@ -100,7 +100,7 @@ bool menuTextView(evt_t event)
readTextFile(lines_count);
break;
case EVT_KEY_FIRST(KEY_UP):
case EVT_ROTARY_LEFT:
if (menuVerticalOffset == 0)
break;
else
@ -108,7 +108,7 @@ bool menuTextView(evt_t event)
readTextFile(lines_count);
break;
case EVT_KEY_FIRST(KEY_DOWN):
case EVT_ROTARY_RIGHT:
if (menuVerticalOffset+NUM_BODY_LINES >= lines_count)
break;
else
@ -116,7 +116,7 @@ bool menuTextView(evt_t event)
readTextFile(lines_count);
break;
case EVT_KEY_BREAK(KEY_EXIT):
case EVT_KEY_FIRST(KEY_EXIT):
popMenu();
break;
}
@ -131,7 +131,7 @@ bool menuTextView(evt_t event)
#endif
// lcd_putsCenter(MENU_FOOTER_TOP, title, HEADER_COLOR);
drawVerticalScrollbar(LCD_W-5, 30, MENU_FOOTER_TOP-34, menuVerticalOffset, lines_count, NUM_BODY_LINES);
drawVerticalScrollbar(LCD_W-5, 50, 195, menuVerticalOffset, lines_count, NUM_BODY_LINES);
return true;
}