From 82034cbaeef385748dfe96bf5657fff070bb8d6f Mon Sep 17 00:00:00 2001 From: Victor Wheeler Date: Thu, 6 Feb 2025 07:14:57 -0700 Subject: [PATCH] feat(observer): rename arg to clarify correct use... ...`subject` => `group_subject` to clarify meaning and correct use so that it is clear that it is not the same as any of the subjects in the `list[]` argument. --- src/others/observer/lv_observer.c | 16 ++++++++-------- src/others/observer/lv_observer.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/others/observer/lv_observer.c b/src/others/observer/lv_observer.c index 496c4ed231..4717935a4f 100644 --- a/src/others/observer/lv_observer.c +++ b/src/others/observer/lv_observer.c @@ -279,18 +279,18 @@ lv_color_t lv_subject_get_previous_color(lv_subject_t * subject) return subject->prev_value.color; } -void lv_subject_init_group(lv_subject_t * subject, lv_subject_t * list[], uint32_t list_len) +void lv_subject_init_group(lv_subject_t * group_subject, lv_subject_t * list[], uint32_t list_len) { - subject->type = LV_SUBJECT_TYPE_GROUP; - subject->size = list_len; - lv_ll_init(&(subject->subs_ll), sizeof(lv_observer_t)); - subject->value.pointer = list; + group_subject->type = LV_SUBJECT_TYPE_GROUP; + group_subject->size = list_len; + lv_ll_init(&(group_subject->subs_ll), sizeof(lv_observer_t)); + group_subject->value.pointer = list; - /* bind all subjects to this subject */ + /* Bind all list[] subjects to `group_subject`. */ uint32_t i; for(i = 0; i < list_len; i++) { - /*If a subject in the group changes notify the group itself*/ - lv_subject_add_observer(list[i], group_notify_cb, subject); + /* If a subject in `list[]` changes, notify `group_subject`. */ + lv_subject_add_observer(list[i], group_notify_cb, group_subject); } } diff --git a/src/others/observer/lv_observer.h b/src/others/observer/lv_observer.h index 5c106297b0..fa4b305b69 100644 --- a/src/others/observer/lv_observer.h +++ b/src/others/observer/lv_observer.h @@ -204,7 +204,7 @@ lv_color_t lv_subject_get_previous_color(lv_subject_t * subject); updated, Observers of `group_subject` will be notified. * @param list_len number of elements in `list[]` */ -void lv_subject_init_group(lv_subject_t * subject, lv_subject_t * list[], uint32_t list_len); +void lv_subject_init_group(lv_subject_t * group_subject, lv_subject_t * list[], uint32_t list_len); /** * Remove all Observers from a Subject and free allocated memory, and delete