diff --git a/src/gui/mainbar/mainbar.cpp b/src/gui/mainbar/mainbar.cpp index f05522e..175f7a2 100644 --- a/src/gui/mainbar/mainbar.cpp +++ b/src/gui/mainbar/mainbar.cpp @@ -186,3 +186,8 @@ lv_obj_t * mainbar_obj_create(lv_obj_t *parent) return child; } + +void mainbar_add_slide_element(lv_obj_t *element) +{ + lv_tileview_add_element( mainbar, element ); +} \ No newline at end of file diff --git a/src/gui/mainbar/mainbar.h b/src/gui/mainbar/mainbar.h index 89fd95e..9ff0e20 100644 --- a/src/gui/mainbar/mainbar.h +++ b/src/gui/mainbar/mainbar.h @@ -109,4 +109,6 @@ lv_obj_t * mainbar_obj_create(lv_obj_t *parent); + void mainbar_add_slide_element(lv_obj_t *element); + #endif // _MAINBAR_H \ No newline at end of file diff --git a/src/gui/mainbar/setup_tile/battery_settings/battery_settings.cpp b/src/gui/mainbar/setup_tile/battery_settings/battery_settings.cpp index dfd240a..aba1fa5 100644 --- a/src/gui/mainbar/setup_tile/battery_settings/battery_settings.cpp +++ b/src/gui/mainbar/setup_tile/battery_settings/battery_settings.cpp @@ -66,6 +66,7 @@ void battery_settings_tile_setup( void ) { // register an setup icon an set an callback battery_setup_icon_cont = setup_tile_register_setup(); lv_obj_t *battery_setup = lv_imgbtn_create ( battery_setup_icon_cont, NULL); + mainbar_add_slide_element(battery_setup); lv_imgbtn_set_src( battery_setup, LV_BTN_STATE_RELEASED, &battery_icon_64px); lv_imgbtn_set_src( battery_setup, LV_BTN_STATE_PRESSED, &battery_icon_64px); lv_imgbtn_set_src( battery_setup, LV_BTN_STATE_CHECKED_RELEASED, &battery_icon_64px); diff --git a/src/gui/mainbar/setup_tile/display_settings/display_setting.cpp b/src/gui/mainbar/setup_tile/display_settings/display_setting.cpp index d5dd0cd..2e096fa 100644 --- a/src/gui/mainbar/setup_tile/display_settings/display_setting.cpp +++ b/src/gui/mainbar/setup_tile/display_settings/display_setting.cpp @@ -65,6 +65,7 @@ void display_settings_tile_setup( void ) { // register an setup icon an set an callback display_setup_icon_cont = setup_tile_register_setup(); lv_obj_t *display_setup_icon = lv_imgbtn_create ( display_setup_icon_cont, NULL); + mainbar_add_slide_element(display_setup_icon); lv_imgbtn_set_src( display_setup_icon, LV_BTN_STATE_RELEASED, &brightness_64px); lv_imgbtn_set_src( display_setup_icon, LV_BTN_STATE_PRESSED, &brightness_64px); lv_imgbtn_set_src( display_setup_icon, LV_BTN_STATE_CHECKED_RELEASED, &brightness_64px); diff --git a/src/gui/mainbar/setup_tile/move_settings/move_settings.cpp b/src/gui/mainbar/setup_tile/move_settings/move_settings.cpp index 06f0d59..e3b5c50 100644 --- a/src/gui/mainbar/setup_tile/move_settings/move_settings.cpp +++ b/src/gui/mainbar/setup_tile/move_settings/move_settings.cpp @@ -55,6 +55,7 @@ void move_settings_tile_setup( void ) { // register an setup icon an set an callback lv_obj_t *move_setup = lv_imgbtn_create ( setup_tile_register_setup(), NULL); + mainbar_add_slide_element(move_setup); lv_imgbtn_set_src( move_setup, LV_BTN_STATE_RELEASED, &move_64px); lv_imgbtn_set_src( move_setup, LV_BTN_STATE_PRESSED, &move_64px); lv_imgbtn_set_src( move_setup, LV_BTN_STATE_CHECKED_RELEASED, &move_64px); diff --git a/src/gui/mainbar/setup_tile/setup.cpp b/src/gui/mainbar/setup_tile/setup.cpp index 70d2773..6555843 100644 --- a/src/gui/mainbar/setup_tile/setup.cpp +++ b/src/gui/mainbar/setup_tile/setup.cpp @@ -42,7 +42,7 @@ void setup_tile_setup( void ) { setup_entry[ setup ].y = SETUP_FIRST_Y_POS + ( ( setup / MAX_SETUP_ICON_HORZ ) * ( SETUP_ICON_Y_SIZE + SETUP_ICON_Y_CLEARENCE ) ); setup_entry[ setup ].active = false; // create app icon container - setup_entry[ setup ].setup = lv_obj_create( setup_cont, NULL ); + setup_entry[ setup ].setup = mainbar_obj_create( setup_cont ); lv_obj_reset_style_list( setup_entry[ setup ].setup, LV_OBJ_PART_MAIN ); lv_obj_add_style( setup_entry[ setup ].setup, LV_OBJ_PART_MAIN, &setup_style ); lv_obj_set_size( setup_entry[ setup ].setup, SETUP_ICON_X_SIZE, SETUP_ICON_Y_SIZE ); diff --git a/src/gui/mainbar/setup_tile/time_settings/time_settings.cpp b/src/gui/mainbar/setup_tile/time_settings/time_settings.cpp index 9aaf7ba..ce054a8 100644 --- a/src/gui/mainbar/setup_tile/time_settings/time_settings.cpp +++ b/src/gui/mainbar/setup_tile/time_settings/time_settings.cpp @@ -59,6 +59,7 @@ void time_settings_tile_setup( void ) { // register an setup icon an set an callback lv_obj_t *move_setup = lv_imgbtn_create ( setup_tile_register_setup(), NULL); + mainbar_add_slide_element(move_setup); lv_imgbtn_set_src( move_setup, LV_BTN_STATE_RELEASED, &time_64px); lv_imgbtn_set_src( move_setup, LV_BTN_STATE_PRESSED, &time_64px); lv_imgbtn_set_src( move_setup, LV_BTN_STATE_CHECKED_RELEASED, &time_64px); diff --git a/src/gui/mainbar/setup_tile/update/update.cpp b/src/gui/mainbar/setup_tile/update/update.cpp index 33634e4..b2e9075 100644 --- a/src/gui/mainbar/setup_tile/update/update.cpp +++ b/src/gui/mainbar/setup_tile/update/update.cpp @@ -74,6 +74,7 @@ void update_tile_setup( void ) { // register an setup icon an set an callback update_setup_icon_cont = setup_tile_register_setup(); lv_obj_t *update_setup = lv_imgbtn_create ( update_setup_icon_cont, NULL); + mainbar_add_slide_element(update_setup); lv_imgbtn_set_src( update_setup, LV_BTN_STATE_RELEASED, &update_64px); lv_imgbtn_set_src( update_setup, LV_BTN_STATE_PRESSED, &update_64px); lv_imgbtn_set_src( update_setup, LV_BTN_STATE_CHECKED_RELEASED, &update_64px); diff --git a/src/gui/mainbar/setup_tile/wlan_settings/wlan_settings.cpp b/src/gui/mainbar/setup_tile/wlan_settings/wlan_settings.cpp index f80c16c..c5ce29f 100644 --- a/src/gui/mainbar/setup_tile/wlan_settings/wlan_settings.cpp +++ b/src/gui/mainbar/setup_tile/wlan_settings/wlan_settings.cpp @@ -83,6 +83,7 @@ void wlan_settings_tile_setup( void ) { // register an setup icon an set an callback lv_obj_t *wifi_setup = lv_imgbtn_create ( setup_tile_register_setup(), NULL); + mainbar_add_slide_element(wifi_setup); lv_imgbtn_set_src( wifi_setup, LV_BTN_STATE_RELEASED, &wifi_64px); lv_imgbtn_set_src( wifi_setup, LV_BTN_STATE_PRESSED, &wifi_64px); lv_imgbtn_set_src( wifi_setup, LV_BTN_STATE_CHECKED_RELEASED, &wifi_64px);