Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 16:55:20 +03:00
Code Issues Wiki Activity

[Horus] MODEL SELECT bug fixes

Browse source
This commit is contained in:
Bertrand Songis 2016-06-10 23:35:54 +02:00
parent c22818442e
commit 575eb3d0d1
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
radio/src/gui/horus/menu_model_select.cpp
View file

@ -106,6 +106,7 @@ void onCategorySelectMenu(const char * result)
}
else if (result == STR_DELETE_CATEGORY) {
modelslist.removeCategory(currentCategory);
modelslist.save();
setCurrentCategory(currentCategoryIndex-1);
}
}
@ -260,6 +261,11 @@ bool menuModelSelect(evt_t event)
break;
}
if (currentCategory && currentCategory->size() == 0) {
selectMode = MODE_SELECT_CATEGORY;
currentModel = NULL;
}
// Header
theme->drawTopbarBackground(ICON_LIBRARY);
@ -320,21 +326,15 @@ bool menuModelSelect(evt_t event)
}
}
if (selectMode == MODE_SELECT_MODEL) {
if (index == 0) {
selectMode = MODE_SELECT_CATEGORY;
menuVerticalPosition = modelsVerticalPosition;
menuHorizontalPosition = modelsHorizontalPosition;
menuVerticalOffset = modelsVerticalOffset;
if (navigate(event, index, 3, 2)) {
modelsVerticalPosition = menuVerticalPosition;
modelsHorizontalPosition = menuHorizontalPosition;
modelsVerticalOffset = menuVerticalOffset;
putEvent(EVT_REFRESH);
}
else {
menuVerticalPosition = modelsVerticalPosition;
menuHorizontalPosition = modelsHorizontalPosition;
menuVerticalOffset = modelsVerticalOffset;
if (navigate(event, index, 3, 2)) {
modelsVerticalPosition = menuVerticalPosition;
modelsHorizontalPosition = menuHorizontalPosition;
modelsVerticalOffset = menuVerticalOffset;
putEvent(EVT_REFRESH);
setCurrentModel(MODEL_INDEX());
}
setCurrentModel(MODEL_INDEX());
}
if (currentModel) {
lcd->drawText(CATEGORIES_WIDTH+MENUS_MARGIN_LEFT, MENU_FOOTER_TOP+2, currentModel->name, TEXT_INVERTED_COLOR);