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

fix: model setup jumping focus issues

Browse Source
This commit is contained in:
Raphael Coeffic
2022-06-11 15:38:08 +02:00
committed by Raphael Coeffic
parent 0d7e262358
commit be1312f6c9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/module_setup.cpp
+1 -1
View File
@@ -37,7 +37,7 @@
ModuleWindow::ModuleWindow(FormWindow *parent, const rect_t &rect,
uint8_t moduleIdx) :
FormGroup(parent, rect, FORWARD_SCROLL | FORM_FORWARD_FOCUS),
FormGroup(parent, rect, FORWARD_SCROLL | NO_FOCUS | FORM_FORWARD_FOCUS),
moduleIdx(moduleIdx)
{
update();
radio/src/gui/colorlcd/tabsgroup.cpp
+2 -2
View File
@@ -114,7 +114,7 @@ bool TabsCarousel::onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t st
TabsGroup::TabsGroup(uint8_t icon):
Window(MainWindow::instance(), { 0, 0, LCD_W, LCD_H }, OPAQUE),
header(this, icon),
body(this, { 0, MENU_BODY_TOP, LCD_W, MENU_BODY_HEIGHT }, FORM_FORWARD_FOCUS)
body(this, { 0, MENU_BODY_TOP, LCD_W, MENU_BODY_HEIGHT }, NO_FOCUS | FORM_FORWARD_FOCUS)
{
Layer::push(this);
}
@@ -196,7 +196,7 @@ void TabsGroup::setVisibleTab(PageTab* tab)
if (tab->onSetVisible) tab->onSetVisible();
auto form = new FormWindow(&body, rect_t{0, 0, body.width(), body.height()},
FORM_FORWARD_FOCUS);
NO_FOCUS | FORM_FORWARD_FOCUS);
tab->build(form);
form->setFocus();
radio/src/gui/colorlcd/trainer_setup.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ class TrChoice : public Choice
TrainerModuleWindow::TrainerModuleWindow(FormWindow *parent,
const rect_t &rect) :
FormGroup(parent, rect, FORWARD_SCROLL | FORM_FORWARD_FOCUS)
FormGroup(parent, rect, FORWARD_SCROLL | NO_FOCUS | FORM_FORWARD_FOCUS)
{
update();
}