xiaozhi/xiaozhi-esp32
1
0
Fork 1
mirror of https://github.com/78/xiaozhi-esp32.git synced 2026-02-27 14:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address code review feedback on LVGL object deletion fix

Browse Source 
- Move last_child retrieval after deletion to avoid stale pointer
- Add child_count > 0 check before scrolling to prevent edge case issues
- Add lv_obj_is_valid() check for last_bubble for consistency

Co-authored-by: 78 <4488133+78@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-29 17:19:10 +00:00
parent 8ddeac1234
commit c37250e563
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/display/lcd_display.cc
View File

@@ -510,15 +510,17 @@ void LcdDisplay::SetChatMessage(const char* role, const char* content) {
if (child_count >= MAX_MESSAGES) {
// Delete the oldest message (first child object)
lv_obj_t* first_child = lv_obj_get_child(content_, 0);
lv_obj_t* last_child = lv_obj_get_child(content_, child_count - 1);
if (first_child != nullptr) {
lv_obj_del(first_child);
// Refresh child count after deletion
child_count = lv_obj_get_child_cnt(content_);
}
// Scroll to the last message immediately
if (last_child != nullptr && lv_obj_is_valid(last_child)) {
lv_obj_scroll_to_view_recursive(last_child, LV_ANIM_OFF);
// Scroll to the last message immediately (get last_child after deletion)
if (child_count > 0) {
lv_obj_t* last_child = lv_obj_get_child(content_, child_count - 1);
if (last_child != nullptr && lv_obj_is_valid(last_child)) {
lv_obj_scroll_to_view_recursive(last_child, LV_ANIM_OFF);
}
}
}
@@ -532,7 +534,7 @@ void LcdDisplay::SetChatMessage(const char* role, const char* content) {
if (last_container != nullptr && lv_obj_is_valid(last_container) && lv_obj_get_child_cnt(last_container) > 0) {
// Get the bubble inside the container
lv_obj_t* last_bubble = lv_obj_get_child(last_container, 0);
if (last_bubble != nullptr) {
if (last_bubble != nullptr && lv_obj_is_valid(last_bubble)) {
// Check if bubble type is system message
void* bubble_type_ptr = lv_obj_get_user_data(last_bubble);
if (bubble_type_ptr != nullptr && strcmp((const char*)bubble_type_ptr, "system") == 0) {