From d316aedf353c0698f9c92b6e59ef1d0e572bdf7c Mon Sep 17 00:00:00 2001 From: philmoz Date: Fri, 17 Nov 2023 18:27:46 +1100 Subject: [PATCH] fix(color): Quick menu does not close properly. (#4332) Co-authored-by: philmoz --- radio/src/gui/colorlcd/view_main_menu.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/colorlcd/view_main_menu.cpp b/radio/src/gui/colorlcd/view_main_menu.cpp index a47324910..36bb4f3bc 100644 --- a/radio/src/gui/colorlcd/view_main_menu.cpp +++ b/radio/src/gui/colorlcd/view_main_menu.cpp @@ -40,17 +40,18 @@ #endif ViewMainMenu::ViewMainMenu(Window* parent, std::function closeHandler) : - Window(parent->getFullScreenWindow(), - {(LCD_W - VM_W) / 2, (LCD_H - VM_H) / 2, VM_W, VM_H}, 0, 0, - etx_modal_dialog_create), + Window(parent->getFullScreenWindow(), {0, 0, LCD_W, LCD_H}), closeHandler(std::move(closeHandler)) { - padAll(8); - // Save focus Layer::push(this); - auto carousel = new SelectFabCarousel(this); + auto box = + new Window(this, {(LCD_W - VM_W) / 2, (LCD_H - VM_H) / 2, VM_W, VM_H}, 0, + 0, etx_modal_dialog_create); + box->padAll(8); + + auto carousel = new SelectFabCarousel(box); carousel->addButton(ICON_MODEL_SELECT, STR_MAIN_MENU_MANAGE_MODELS, [=]() -> uint8_t { deleteLater();