piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Menu updates

Browse Source
This commit is contained in:
Bertrand Songis
2019-11-28 17:24:21 +01:00
parent e4202c6ef4
commit c96a31026a
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/menu.cpp
Vendored
+2 -8
View File
@@ -107,12 +107,6 @@ void MenuWindow::paint(BitmapBuffer * dc)
dc->drawText(MENUS_WIDTH / 2, (MENUS_HEADER_HEIGHT - getFontHeight(FONT(BOLD))) / 2, title.c_str(), CENTERED | FONT(BOLD));
dc->drawSolidHorizontalLine(0, MENUS_HEADER_HEIGHT - 1, MENUS_WIDTH, MENU_LINE_COLOR);
}
// the cancel button
if (MENUS_FOOTER_HEIGHT > 0) {
dc->drawText(MENUS_WIDTH / 2, height() - MENUS_FOOTER_HEIGHT + (MENUS_FOOTER_HEIGHT - getFontHeight(FONT(BOLD))) / 2, "Cancel", CENTERED);
dc->drawSolidHorizontalLine(0, height() - MENUS_FOOTER_HEIGHT, MENUS_WIDTH, MENU_LINE_COLOR);
}
}
Menu::Menu():
@@ -130,8 +124,8 @@ void Menu::updatePosition()
// there is no navigation bar at the left, we may center the window on screen
auto headerHeight = menuWindow->title.empty() ? 0 : MENUS_HEADER_HEIGHT;
auto bodyHeight = limit<coord_t>(MENUS_MIN_HEIGHT, menuWindow->body.lines.size() * MENUS_LINE_HEIGHT - 1, MENUS_MAX_HEIGHT);
menuWindow->setTop((LCD_H - headerHeight - bodyHeight - MENUS_FOOTER_HEIGHT) / 2 + MENUS_OFFSET_TOP);
menuWindow->setHeight(headerHeight + bodyHeight + MENUS_FOOTER_HEIGHT);
menuWindow->setTop((LCD_H - headerHeight - bodyHeight) / 2 + MENUS_OFFSET_TOP);
menuWindow->setHeight(headerHeight + bodyHeight);
menuWindow->body.setTop(headerHeight);
menuWindow->body.setHeight(bodyHeight);
}