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

Menu overlay

Browse Source
This commit is contained in:
Bertrand Songis
2019-11-29 09:04:06 +01:00
parent c96a31026a
commit 6f9a22e681
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/menu.cpp
Vendored
+8 -5
View File
@@ -23,7 +23,7 @@
MenuWindow::MenuWindow(Menu * parent):
Window(parent, {(LCD_W - MENUS_WIDTH) / 2, (LCD_H - MENUS_WIDTH) / 2, MENUS_WIDTH, 0}, OPAQUE),
body(this, {0, 0, width(), height()}, OPAQUE)
body(this, {0, 0, width(), height()})
{
body.setFocus();
}
@@ -74,8 +74,6 @@ bool MenuBody::onTouchEnd(coord_t x, coord_t y)
void MenuBody::paint(BitmapBuffer * dc)
{
dc->clear(MENU_BGCOLOR);
for (auto i = 0; i < (int)lines.size(); i++) {
auto & line = lines[i];
LcdFlags flags = MENU_COLOR;
@@ -104,13 +102,13 @@ void MenuWindow::paint(BitmapBuffer * dc)
// the title
if (!title.empty()) {
dc->drawText(MENUS_WIDTH / 2, (MENUS_HEADER_HEIGHT - getFontHeight(FONT(BOLD))) / 2, title.c_str(), CENTERED | FONT(BOLD));
dc->drawText(MENUS_WIDTH / 2, (MENUS_HEADER_HEIGHT - getFontHeight(MENU_HEADER_FONT)) / 2, title.c_str(), CENTERED | MENU_HEADER_FONT);
dc->drawSolidHorizontalLine(0, MENUS_HEADER_HEIGHT - 1, MENUS_WIDTH, MENU_LINE_COLOR);
}
}
Menu::Menu():
Window(&mainWindow, {0, 0, LCD_W, LCD_H}, TRANSPARENT),
Window(&mainWindow, {0, 0, LCD_W, LCD_H}),
#if !defined(HARDWARE_TOUCH)
previousFocus(focusWindow),
#endif
@@ -156,6 +154,11 @@ void Menu::removeLines()
updatePosition();
}
void Menu::paint(BitmapBuffer * dc)
{
dc->drawFilledRect(0, 0, width(), height(), SOLID, OVERLAY_COLOR | OPACITY(5));
}
#if defined(HARDWARE_KEYS)
void Menu::onEvent(event_t event)
{
radio/src/thirdparty/libopenui/src/menu.h
Vendored
+4 -2
View File
@@ -59,8 +59,8 @@ class MenuBody: public Window {
};
public:
MenuBody(Window * parent, const rect_t & rect, WindowFlags flags):
Window(parent, rect, flags)
MenuBody(Window * parent, const rect_t & rect):
Window(parent, rect)
{
setPageHeight(MENUS_LINE_HEIGHT);
}
@@ -187,6 +187,8 @@ class Menu: public Window {
menuWindow->body.select(index);
}
void paint(BitmapBuffer * dc) override;
#if defined(HARDWARE_KEYS)
void onEvent(event_t event) override;
#endif