diff --git a/radio/src/gui/colorlcd/module_setup.cpp b/radio/src/gui/colorlcd/module_setup.cpp index 2ebd36e63..b1655d0d0 100644 --- a/radio/src/gui/colorlcd/module_setup.cpp +++ b/radio/src/gui/colorlcd/module_setup.cpp @@ -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(); diff --git a/radio/src/gui/colorlcd/tabsgroup.cpp b/radio/src/gui/colorlcd/tabsgroup.cpp index c5616d8aa..a468bc63f 100644 --- a/radio/src/gui/colorlcd/tabsgroup.cpp +++ b/radio/src/gui/colorlcd/tabsgroup.cpp @@ -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(); diff --git a/radio/src/gui/colorlcd/trainer_setup.cpp b/radio/src/gui/colorlcd/trainer_setup.cpp index 40e04a2b1..a0bab5f7e 100644 --- a/radio/src/gui/colorlcd/trainer_setup.cpp +++ b/radio/src/gui/colorlcd/trainer_setup.cpp @@ -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(); }