Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-31 16:27:03 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

chore(observer): add _event suffix to add_subject_set/increment

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2025-06-02 20:09:19 +02:00
parent 3e61613fdd
commit bd9e9d2f49
7 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/src/details/auxiliary-modules/observer/observer.rst
+4 -4
View File
@@ -558,12 +558,12 @@ Note: these callbacks are **not** automatically removed when a subject is deinit
Increment Increment
~~~~~~~~~ ~~~~~~~~~
:cpp:expr:`lv_obj_add_subject_increment(obj, subject, step, min, max)` :cpp:expr:`lv_obj_add_subject_increment_event(obj, subject, step, min, max)`
Increments the subject's value by `step`, clamped between `min` and `max`. Increments the subject's value by `step`, clamped between `min` and `max`.
For example: For example:
:cpp:expr:`lv_obj_add_subject_increment(button1, subject1, LV_EVENT_CLICKED, 5, -10, 80);` :cpp:expr:`lv_obj_add_subject_increment_event(button1, subject1, LV_EVENT_CLICKED, 5, -10, 80);`
This will increment `subject1` by 5 when `button1` is clicked. This will increment `subject1` by 5 when `button1` is clicked.
The resulting value will be constrained to the range -10 to 80. The resulting value will be constrained to the range -10 to 80.
@@ -573,8 +573,8 @@ Using a negative `step` will decrement the value instead.
Set to a Value Set to a Value
~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~
- :cpp:expr:`lv_obj_add_subject_set_int(obj, subject, trigger, value)` - :cpp:expr:`lv_obj_add_subject_set_int_event(obj, subject, trigger, value)`
- :cpp:expr:`lv_obj_add_subject_set_string(obj, subject, trigger, text)` - :cpp:expr:`lv_obj_add_subject_set_string_event(obj, subject, trigger, text)`
These functions set the given subject (integer or string) to a fixed value when the specified trigger event occurs. These functions set the given subject (integer or string) to a fixed value when the specified trigger event occurs.
src/others/observer/lv_observer.c
+4 -3
View File
@@ -487,7 +487,7 @@ void lv_subject_notify(lv_subject_t * subject)
} while(subject->notify_restart_query); } while(subject->notify_restart_query);
} }
void lv_obj_add_subject_increment(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, int32_t step, void lv_obj_add_subject_increment_event(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, int32_t step,
int32_t min, int32_t max) int32_t min, int32_t max)
{ {
subject_increment_user_data_t * user_data = lv_malloc(sizeof(subject_increment_user_data_t)); subject_increment_user_data_t * user_data = lv_malloc(sizeof(subject_increment_user_data_t));
@@ -505,7 +505,7 @@ void lv_obj_add_subject_increment(lv_obj_t * obj, lv_subject_t * subject, lv_eve
lv_obj_add_event_cb(obj, free_user_data_event_cb, LV_EVENT_DELETE, user_data); lv_obj_add_event_cb(obj, free_user_data_event_cb, LV_EVENT_DELETE, user_data);
} }
void lv_obj_add_subject_set_int(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, int32_t value) void lv_obj_add_subject_set_int_event(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, int32_t value)
{ {
subject_set_int_user_data_t * user_data = lv_malloc(sizeof(subject_set_int_user_data_t)); subject_set_int_user_data_t * user_data = lv_malloc(sizeof(subject_set_int_user_data_t));
if(user_data == NULL) { if(user_data == NULL) {
@@ -521,7 +521,8 @@ void lv_obj_add_subject_set_int(lv_obj_t * obj, lv_subject_t * subject, lv_event
lv_obj_add_event_cb(obj, free_user_data_event_cb, LV_EVENT_DELETE, user_data); lv_obj_add_event_cb(obj, free_user_data_event_cb, LV_EVENT_DELETE, user_data);
} }
void lv_obj_add_subject_set_string(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, const char * value) void lv_obj_add_subject_set_string_event(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger,
const char * value)
{ {
subject_set_string_user_data_t * user_data = lv_malloc(sizeof(subject_set_int_user_data_t)); subject_set_string_user_data_t * user_data = lv_malloc(sizeof(subject_set_int_user_data_t));
if(user_data == NULL) { if(user_data == NULL) {
src/others/observer/lv_observer.h
+4 -3
View File
@@ -315,7 +315,7 @@ void lv_subject_notify(lv_subject_t * subject);
* @param min the minimum value * @param min the minimum value
* @param max the maximum value * @param max the maximum value
*/ */
void lv_obj_add_subject_increment(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, int32_t value, void lv_obj_add_subject_increment_event(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, int32_t value,
int32_t min, int32_t max); int32_t min, int32_t max);
/** /**
@@ -325,7 +325,7 @@ void lv_obj_add_subject_increment(lv_obj_t * obj, lv_subject_t * subject, lv_eve
* @param trigger the trigger on which the subject should be changed * @param trigger the trigger on which the subject should be changed
* @param value the value to set * @param value the value to set
*/ */
void lv_obj_add_subject_set_int(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, int32_t value); void lv_obj_add_subject_set_int_event(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, int32_t value);
/** /**
* Set the value of a string subject. * Set the value of a string subject.
@@ -334,7 +334,8 @@ void lv_obj_add_subject_set_int(lv_obj_t * obj, lv_subject_t * subject, lv_event
* @param trigger the trigger on which the subject should be changed * @param trigger the trigger on which the subject should be changed
* @param value the value to set * @param value the value to set
*/ */
void lv_obj_add_subject_set_string(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger, const char * value); void lv_obj_add_subject_set_string_event(lv_obj_t * obj, lv_subject_t * subject, lv_event_code_t trigger,
const char * value);
/** /**
* Set Widget's flag(s) if an integer Subject's value is equal to a reference value, clear flag otherwise. * Set Widget's flag(s) if an integer Subject's value is equal to a reference value, clear flag otherwise.
src/others/xml/parsers/lv_xml_obj_parser.c
+3 -3
View File
@@ -271,10 +271,10 @@ void lv_obj_xml_subject_set_apply(lv_xml_parser_state_t * state, const char ** a
void * item = lv_xml_state_get_item(state); void * item = lv_xml_state_get_item(state);
if(int_subject) { if(int_subject) {
lv_obj_add_subject_set_int(item, subject, trigger, lv_xml_atoi(value_str)); lv_obj_add_subject_set_int_event(item, subject, trigger, lv_xml_atoi(value_str));
} }
else { else {
lv_obj_add_subject_set_string(item, subject, trigger, value_str); lv_obj_add_subject_set_string_event(item, subject, trigger, value_str);
} }
} }
@@ -326,7 +326,7 @@ void lv_obj_xml_subject_increment_apply(lv_xml_parser_state_t * state, const cha
int32_t step = step_str ? lv_xml_atoi(step_str) : 1; int32_t step = step_str ? lv_xml_atoi(step_str) : 1;
int32_t min_v = min_str ? lv_xml_atoi(min_str) : INT32_MIN; int32_t min_v = min_str ? lv_xml_atoi(min_str) : INT32_MIN;
int32_t max_v = max_str ? lv_xml_atoi(max_str) : INT32_MAX; int32_t max_v = max_str ? lv_xml_atoi(max_str) : INT32_MAX;
lv_obj_add_subject_increment(item, subject, trigger, step, min_v, max_v); lv_obj_add_subject_increment_event(item, subject, trigger, step, min_v, max_v);
} }
void * lv_obj_xml_bind_flag_create(lv_xml_parser_state_t * state, const char ** attrs) void * lv_obj_xml_bind_flag_create(lv_xml_parser_state_t * state, const char ** attrs)
xmls/lv_chart.xml
+1 -1
View File
@@ -37,7 +37,7 @@
<element name="series" type="lv_chart_series" access="add"> <element name="series" type="lv_chart_series" access="add">
<arg name="color" type="color" help=""/> <arg name="color" type="color" help=""/>
<arg name="axis" type="enum:lv_chart_axis+" help="The axis"/> <arg name="axis" type="enum:lv_chart_axis+" default="primary_y" help="The axis"/>
<prop name="values" type="int[count]" help="set values from an array"/> <prop name="values" type="int[count]" help="set values from an array"/>
</element> </element>
xmls/lv_obj.xml
+10 -3
View File
@@ -41,7 +41,7 @@ Example
<element name="style" access="add" type="void"> <element name="style" access="add" type="void">
<arg name="name" type="style"/> <arg name="name" type="style"/>
<arg name="selector" type="selector+"/> <arg name="selector" type="selector+" default="0"/>
</element> </element>
<element name="event_cb" access="add"> <element name="event_cb" access="add">
@@ -50,14 +50,21 @@ Example
<arg name="cb" type="event_cb"/> <arg name="cb" type="event_cb"/>
</element> </element>
<element name="subject_set" access="add"> <element name="subject_set_int_event" access="add">
<arg name="name" type="string"/> <arg name="name" type="string"/>
<arg name="trigger" type="lv_event"/> <arg name="trigger" type="lv_event"/>
<arg name="subject" type="subject"/> <arg name="subject" type="subject"/>
<arg name="value" type="int"/> <arg name="value" type="int"/>
</element> </element>
<element name="subject_increment" access="add"> <element name="subject_set_string_event" access="add">
<arg name="name" type="string"/>
<arg name="trigger" type="lv_event"/>
<arg name="subject" type="subject"/>
<arg name="value" type="int"/>
</element>
<element name="subject_increment_event" access="add">
<arg name="name" type="string"/> <arg name="name" type="string"/>
<arg name="trigger" type="lv_event"/> <arg name="trigger" type="lv_event"/>
<arg name="subject" type="subject"/> <arg name="subject" type="subject"/>
xmls/lv_table.xml
+3 -3
View File
@@ -22,14 +22,14 @@
<element name="column" access="set"> <element name="column" access="set">
<arg name="column" type="int" help=""/> <arg name="column" type="int" help=""/>
<prop name="width" type="px" help="width of the column"/> <arg name="width" type="px" help="width of the column"/>
</element> </element>
<element name="cell" access="set"> <element name="cell" access="set">
<arg name="row" type="int" help=""/> <arg name="row" type="int" help=""/>
<arg name="column" type="int" help=""/> <arg name="column" type="int" help=""/>
<prop name="value" type="string" help=""/> <arg name="value" type="string" help=""/>
<prop name="ctrl" type="enum:lv_table_cell_ctrl+" help=""/> <arg name="ctrl" type="enum:lv_table_cell_ctrl+" help=""/>
</element> </element>
</api> </api>
</widget> </widget>