Corrected the user feedback behaviour to not trigger when swiping back to the settings app from the menu screen

This commit is contained in:
anschrammh 2024-01-16 13:05:10 +01:00
parent c4c6ace3cb
commit 27ac389bfc

View File

@ -976,9 +976,17 @@ static void _simulate_side_screen_item_click(SettingsScreen_t * const settingsSc
// Updating the background of the selected category
lv_obj_set_style_bg_color(item, lv_color_make(178, 223, 219), LV_PART_MAIN);
if(settingsScreen->last_selected_item)
{
lv_obj_set_style_bg_color(settingsScreen->last_selected_item, lv_color_white(), LV_PART_MAIN);
// Let's give some user feedback that a category was selected by calling the
// callback if one is registered
if(settingsScreen->settingsScreenUserFeedbackCb)
settingsScreen->settingsScreenUserFeedbackCb();
}
// Let's call the settings screen on state change callback if registered
if(settingsScreen->settingsScreenOnStateChangeCb)
settingsScreen->settingsScreenOnStateChangeCb(SETTINGS_SCREEN_STATE_OPENED, (SettingsScreenCategory_e)lv_obj_get_user_data(item));
@ -991,11 +999,6 @@ static void _simulate_side_screen_item_click(SettingsScreen_t * const settingsSc
settingsScreen->last_selected_item = item;
// Let's give some user feedback that a category was selected by calling the
// callback if one is registered
if(settingsScreen->settingsScreenUserFeedbackCb)
settingsScreen->settingsScreenUserFeedbackCb();
lv_obj_clean(settingsScreen->side_screen);
if(item == settingsScreen->time_and_date_item)