From efe2992c7523f9f0e3a98e61fc197eab397eb195 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Wed, 9 Aug 2023 22:32:27 +0200 Subject: [PATCH] Fix submenu header usage and add warning --- .../scenes/xtreme_app_scene_interface_mainmenu_add.c | 4 ++-- applications/services/gui/modules/submenu.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu_add.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu_add.c index 5a81d5d77..b45163ead 100644 --- a/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu_add.c +++ b/applications/main/xtreme_app/scenes/xtreme_app_scene_interface_mainmenu_add.c @@ -67,6 +67,8 @@ void xtreme_app_scene_interface_mainmenu_add_on_enter(void* context) { XtremeApp* app = context; Submenu* submenu = app->submenu; + submenu_set_header(submenu, "Add Menu App:"); + submenu_add_item( submenu, "Main App", @@ -81,8 +83,6 @@ void xtreme_app_scene_interface_mainmenu_add_on_enter(void* context) { xtreme_app_scene_interface_mainmenu_add_submenu_callback, app); - submenu_set_header(submenu, "Add Menu App:"); - view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewSubmenu); } diff --git a/applications/services/gui/modules/submenu.h b/applications/services/gui/modules/submenu.h index 03337d777..f4fde65cf 100644 --- a/applications/services/gui/modules/submenu.h +++ b/applications/services/gui/modules/submenu.h @@ -87,6 +87,7 @@ void submenu_reset(Submenu* submenu); void submenu_set_selected_item(Submenu* submenu, uint32_t index); /** Set optional header for submenu + * Must be called before adding items OR after adding items but also call set_selected_item() after set_header() * * @param submenu Submenu instance * @param header header to set