mirror of
https://github.com/lvgl/lvgl.git
synced 2026-05-26 11:07:34 +08:00
fix(observer): fix lv_subject_notify_if_changed not defined when LV_USE_DROPDOWN = 0 (#7783)
Arduino Lint / lint (push) Has been cancelled
MicroPython CI / Build rp2 port (push) Has been cancelled
MicroPython CI / Build stm32 port (push) Has been cancelled
MicroPython CI / Build unix port (push) Has been cancelled
MicroPython CI / Build esp32 port (push) Has been cancelled
C/C++ CI / Build OPTIONS_16BIT - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_24BIT - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_FULL_32BIT - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_NORMAL_8BIT - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_SDL - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_VG_LITE - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_16BIT - cl - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_16BIT - gcc - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_24BIT - cl - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_24BIT - gcc - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_FULL_32BIT - cl - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_FULL_32BIT - gcc - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_VG_LITE - cl - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_VG_LITE - gcc - Windows (push) Has been cancelled
C/C++ CI / Build ESP IDF ESP32S3 (push) Has been cancelled
C/C++ CI / Run tests with 32bit build (push) Has been cancelled
C/C++ CI / Run tests with 64bit build (push) Has been cancelled
BOM Check / bom-check (push) Has been cancelled
Verify that lv_conf_internal.h matches repository state / verify-conf-internal (push) Has been cancelled
Verify the widget property name / verify-property-name (push) Has been cancelled
Verify code formatting / verify-formatting (push) Has been cancelled
Build docs / build-and-deploy (push) Has been cancelled
Test API JSON generator / Test API JSON (push) Has been cancelled
Check Makefile / Build using Makefile (push) Has been cancelled
Check Makefile for UEFI / Build using Makefile for UEFI (push) Has been cancelled
Port repo release update / run-release-branch-updater (push) Has been cancelled
Verify Kconfig / verify-kconfig (push) Has been cancelled
Arduino Lint / lint (push) Has been cancelled
MicroPython CI / Build rp2 port (push) Has been cancelled
MicroPython CI / Build stm32 port (push) Has been cancelled
MicroPython CI / Build unix port (push) Has been cancelled
MicroPython CI / Build esp32 port (push) Has been cancelled
C/C++ CI / Build OPTIONS_16BIT - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_24BIT - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_FULL_32BIT - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_NORMAL_8BIT - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_SDL - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_VG_LITE - Ubuntu (push) Has been cancelled
C/C++ CI / Build OPTIONS_16BIT - cl - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_16BIT - gcc - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_24BIT - cl - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_24BIT - gcc - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_FULL_32BIT - cl - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_FULL_32BIT - gcc - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_VG_LITE - cl - Windows (push) Has been cancelled
C/C++ CI / Build OPTIONS_VG_LITE - gcc - Windows (push) Has been cancelled
C/C++ CI / Build ESP IDF ESP32S3 (push) Has been cancelled
C/C++ CI / Run tests with 32bit build (push) Has been cancelled
C/C++ CI / Run tests with 64bit build (push) Has been cancelled
BOM Check / bom-check (push) Has been cancelled
Verify that lv_conf_internal.h matches repository state / verify-conf-internal (push) Has been cancelled
Verify the widget property name / verify-property-name (push) Has been cancelled
Verify code formatting / verify-formatting (push) Has been cancelled
Build docs / build-and-deploy (push) Has been cancelled
Test API JSON generator / Test API JSON (push) Has been cancelled
Check Makefile / Build using Makefile (push) Has been cancelled
Check Makefile for UEFI / Build using Makefile for UEFI (push) Has been cancelled
Port repo release update / run-release-branch-updater (push) Has been cancelled
Verify Kconfig / verify-kconfig (push) Has been cancelled
This commit is contained in:
@@ -764,6 +764,37 @@ static void obj_value_changed_event_cb(lv_event_t * e)
|
||||
lv_subject_set_int(subject, lv_obj_has_state(obj, LV_STATE_CHECKED));
|
||||
}
|
||||
|
||||
static void lv_subject_notify_if_changed(lv_subject_t * subject)
|
||||
{
|
||||
|
||||
switch(subject->type) {
|
||||
case LV_SUBJECT_TYPE_INVALID :
|
||||
case LV_SUBJECT_TYPE_NONE :
|
||||
return;
|
||||
case LV_SUBJECT_TYPE_INT :
|
||||
if(subject->value.num != subject->prev_value.num) {
|
||||
lv_subject_notify(subject);
|
||||
}
|
||||
break;
|
||||
case LV_SUBJECT_TYPE_GROUP :
|
||||
case LV_SUBJECT_TYPE_POINTER :
|
||||
/* Always notify as we don't know how to compare this */
|
||||
lv_subject_notify(subject);
|
||||
break;
|
||||
case LV_SUBJECT_TYPE_COLOR :
|
||||
if(!lv_color_eq(subject->value.color, subject->prev_value.color)) {
|
||||
lv_subject_notify(subject);
|
||||
}
|
||||
break;
|
||||
case LV_SUBJECT_TYPE_STRING:
|
||||
if(!subject->prev_value.pointer ||
|
||||
lv_strcmp(subject->value.pointer, subject->prev_value.pointer)) {
|
||||
lv_subject_notify(subject);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#if LV_USE_LABEL
|
||||
|
||||
static void label_text_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
|
||||
@@ -858,38 +889,6 @@ static void dropdown_value_observer_cb(lv_observer_t * observer, lv_subject_t *
|
||||
lv_dropdown_set_selected(observer->target, subject->value.num, LV_ANIM_OFF);
|
||||
}
|
||||
|
||||
static void lv_subject_notify_if_changed(lv_subject_t * subject)
|
||||
{
|
||||
|
||||
switch(subject->type) {
|
||||
case LV_SUBJECT_TYPE_INVALID :
|
||||
case LV_SUBJECT_TYPE_NONE :
|
||||
return;
|
||||
case LV_SUBJECT_TYPE_INT :
|
||||
if(subject->value.num != subject->prev_value.num) {
|
||||
lv_subject_notify(subject);
|
||||
}
|
||||
break;
|
||||
case LV_SUBJECT_TYPE_GROUP :
|
||||
case LV_SUBJECT_TYPE_POINTER :
|
||||
/* Always notify as we don't know how to compare this */
|
||||
lv_subject_notify(subject);
|
||||
break;
|
||||
case LV_SUBJECT_TYPE_COLOR :
|
||||
if(!lv_color_eq(subject->value.color, subject->prev_value.color)) {
|
||||
lv_subject_notify(subject);
|
||||
}
|
||||
break;
|
||||
case LV_SUBJECT_TYPE_STRING:
|
||||
if(!subject->prev_value.pointer ||
|
||||
lv_strcmp(subject->value.pointer, subject->prev_value.pointer)) {
|
||||
lv_subject_notify(subject);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#endif /*LV_USE_DROPDOWN*/
|
||||
|
||||
#endif /*LV_USE_OBSERVER*/
|
||||
|
||||
Reference in New Issue
Block a user