github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(observer): fix the parameters of the observer_cb for Micropython compatibility

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2023-12-05 14:25:11 +01:00
parent a6ec0a1101
commit c902556794
14 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/libs/tiny_ttf/lv_example_tiny_ttf_3.c
View File

@@ -1,7 +1,7 @@
#include "../../lv_examples.h"
#if LV_USE_TINY_TTF && LV_BUILD_EXAMPLES && LV_USE_OBSERVER
static void font_size_observer_cb(lv_subject_t * subject, lv_observer_t * observer);
static void font_size_observer_cb(lv_observer_t * observer, lv_subject_t * subject);
static lv_subject_t subject_font;
static lv_font_t font;
@@ -43,7 +43,7 @@ void lv_example_tiny_ttf_3(void)
lv_subject_add_observer(&subject_font, font_size_observer_cb, &style);
}
static void font_size_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void font_size_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
lv_style_t * style = observer->user_data;
int32_t size = lv_subject_get_int(subject);

4
examples/others/observer/lv_example_observer_2.c
View File

@@ -25,7 +25,7 @@ void lv_example_observer_2(void)
* It doesn't know anything about the internals of the UI
* and uses any the `engine_subject` as an interface.
* -------------------------------------------------*/
static void engine_state_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void engine_state_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
LV_UNUSED(observer);
@@ -66,7 +66,7 @@ static void textarea_event_cb(lv_event_t * e)
}
}
static void info_label_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void info_label_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
lv_obj_t * label = lv_observer_get_target(observer);
switch(lv_subject_get_int(subject)) {

8
examples/others/observer/lv_example_observer_3.c
View File

@@ -15,8 +15,8 @@ const char * minute_options =
static void set_btn_clicked_event_cb(lv_event_t * e);
static void close_clicked_event_cb(lv_event_t * e);
static void hour_roller_options_update(lv_subject_t * subject, lv_observer_t * observer);
static void time_observer_cb(lv_subject_t * subject, lv_observer_t * observer);
static void hour_roller_options_update(lv_observer_t * observer, lv_subject_t * subject);
static void time_observer_cb(lv_observer_t * observer, lv_subject_t * subject);
typedef enum {
TIME_FORMAT_12,
@@ -118,7 +118,7 @@ static void close_clicked_event_cb(lv_event_t * e)
}
/*Watch all related subject to display the current time correctly*/
static void time_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void time_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
int32_t hour = lv_subject_get_int(lv_subject_get_group_element(subject, 0));
int32_t minute = lv_subject_get_int(lv_subject_get_group_element(subject, 1));
@@ -136,7 +136,7 @@ static void time_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
}
/*Change the hour options on format change*/
static void hour_roller_options_update(lv_subject_t * subject, lv_observer_t * observer)
static void hour_roller_options_update(lv_observer_t * observer, lv_subject_t * subject)
{
lv_obj_t * roller = lv_observer_get_target(observer);
int32_t prev_selected = lv_roller_get_selected(roller);

12
examples/others/observer/lv_example_observer_4.c
View File

@@ -1,11 +1,11 @@
#include "../../lv_examples.h"
#if LV_USE_OBSERVER && LV_USE_SLIDER && LV_USE_LABEL && LV_USE_ROLLER && LV_USE_DROPDOWN && LV_FONT_MONTSERRAT_30 && LV_BUILD_EXAMPLES
static void cont_observer_cb(lv_subject_t * subject, lv_observer_t * observer);
static void cont_observer_cb(lv_observer_t * observer, lv_subject_t * subject);
static void btn_create(lv_obj_t * parent, const char * text);
static void btn_click_event_cb(lv_event_t * e);
static void btn_observer_cb(lv_subject_t * subject, lv_observer_t * observer);
static void indicator_observer_cb(lv_subject_t * subject, lv_observer_t * observer);
static void btn_observer_cb(lv_observer_t * observer, lv_subject_t * subject);
static void indicator_observer_cb(lv_observer_t * observer, lv_subject_t * subject);
static lv_subject_t current_tab_subject;
static lv_subject_t slider_subject[4];
@@ -74,7 +74,7 @@ static void anim_set_x_cb(void * obj, int32_t v)
lv_obj_set_x(obj, v);
}
static void cont_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void cont_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
int32_t prev_v = lv_subject_get_previous_int(subject);
int32_t cur_v = lv_subject_get_int(subject);
@@ -170,7 +170,7 @@ static void btn_click_event_cb(lv_event_t * e)
lv_subject_set_int(&current_tab_subject, idx);
}
static void btn_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void btn_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
int32_t prev_v = lv_subject_get_previous_int(subject);
int32_t cur_v = lv_subject_get_int(subject);
@@ -182,7 +182,7 @@ static void btn_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
if(idx == cur_v) lv_obj_add_state(btn, LV_STATE_CHECKED);
}
static void indicator_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void indicator_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
int32_t cur_v = lv_subject_get_int(subject);
lv_obj_t * indicator = lv_observer_get_target(observer);

8
examples/others/observer/lv_example_observer_5.c
View File

@@ -10,10 +10,10 @@ typedef enum {
FW_UPDATE_STATE_READY,
} fw_update_state_t;
static void fw_upload_manager_observer_cb(lv_subject_t * subject, lv_observer_t * observer);
static void fw_upload_manager_observer_cb(lv_observer_t * observer, lv_subject_t * subject);
static void fw_update_btn_clicked_event_cb(lv_event_t * e);
static void fw_update_close_event_cb(lv_event_t * e);
static void fw_update_win_observer_cb(lv_subject_t * subject, lv_observer_t * observer);
static void fw_update_win_observer_cb(lv_observer_t * observer, lv_subject_t * subject);
static lv_subject_t fw_download_percent_subject;
static lv_subject_t fw_update_status_subject;
@@ -73,7 +73,7 @@ static void restart_btn_click_event_cb(lv_event_t * e)
lv_subject_set_int(&fw_update_status_subject, FW_UPDATE_STATE_IDLE);
}
static void fw_update_win_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void fw_update_win_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
lv_obj_t * win = lv_observer_get_target(observer);
lv_obj_t * cont = lv_win_get_content(win);
@@ -148,7 +148,7 @@ static void download_timer_cb(lv_timer_t * t)
/**
* Emulate connection and FW dowlading by timers
*/
static void fw_upload_manager_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void fw_upload_manager_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
LV_UNUSED(subject);
LV_UNUSED(observer);

4
examples/others/observer/lv_example_observer_6.c
View File

@@ -56,7 +56,7 @@ typedef struct {
lv_style_t style_scrollbar;
} my_panel_styles_t;
static void my_panel_style_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void my_panel_style_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
LV_UNUSED(subject);
LV_UNUSED(observer);
@@ -126,7 +126,7 @@ typedef struct {
lv_style_t style_pressed;
} my_button_styles_t;
static void my_button_style_observer_cb(lv_subject_t * subject, lv_observer_t * observer)
static void my_button_style_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
LV_UNUSED(subject);
LV_UNUSED(observer);