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

WYSIWYG custom screen setup

Browse source 
not yet very nice, but working.
This commit is contained in:
Raphael Coeffic 2021-04-04 21:00:22 +02:00
parent aff897550e
commit 5d5fcbcc2e
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
radio/src/gui/colorlcd/screen_setup.cpp
View file

@ -188,8 +188,6 @@ class SetupWidgetsPageSlot: public Button
else { else {
dc->drawRect(0, 0, width(), height(), 1, DOTTED, DEFAULT_COLOR); dc->drawRect(0, 0, width(), height(), 1, DOTTED, DEFAULT_COLOR);
} }
if (widget)
widget->paint(dc);
} }
protected: protected:
@ -203,11 +201,15 @@ class SetupWidgetsPage: public FormWindow
public: public:
SetupWidgetsPage(Layout * screen): SetupWidgetsPage(Layout * screen):
FormWindow(MainWindow::instance(), {0, 0, LCD_W, LCD_H}, OPAQUE | FORM_FORWARD_FOCUS), FormWindow(MainWindow::instance(), {0, 0, LCD_W, LCD_H}, OPAQUE | FORM_FORWARD_FOCUS),
screen(screen) screen(screen),
oldParent(screen->getParent())
{ {
Layer::push(this); Layer::push(this);
clearFocus(); clearFocus();
// attach this custom screen here so we can display it
screen->attach(this);
for (unsigned i = 0; i < screen->getZonesCount(); i++) { for (unsigned i = 0; i < screen->getZonesCount(); i++) {
auto rect = screen->getZone(i); auto rect = screen->getZone(i);
new SetupWidgetsPageSlot(this, {rect.x - 1, rect.y - 1, rect.w + 2, rect.h + 2}, screen, i); new SetupWidgetsPageSlot(this, {rect.x - 1, rect.y - 1, rect.w + 2, rect.h + 2}, screen, i);
@ -221,8 +223,10 @@ class SetupWidgetsPage: public FormWindow
#if defined(HARDWARE_TOUCH) #if defined(HARDWARE_TOUCH)
Keyboard::hide(); Keyboard::hide();
#endif #endif
// give it back to its old parent before it gets deleted
screen->attach(oldParent);
Window::deleteLater(detach, trash); FormWindow::deleteLater(detach, trash);
} }
#if defined(HARDWARE_KEYS) #if defined(HARDWARE_KEYS)
@ -238,13 +242,15 @@ class SetupWidgetsPage: public FormWindow
} }
#endif #endif
protected:
Layout* screen;
Window* oldParent;
void paint(BitmapBuffer * dc) override void paint(BitmapBuffer * dc) override
{ {
dc->clear(DEFAULT_BGCOLOR); dc->clear(DEFAULT_BGCOLOR);
} }
protected:
Layout* screen;
}; };
void ScreenSetupPage::build(FormWindow * window) void ScreenSetupPage::build(FormWindow * window)