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

minor fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-03-01 12:04:19 +01:00
parent 2f0443b803
commit 16b9e3fd96
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/scroll/lv_example_scroll_3.c
View File

@@ -23,6 +23,7 @@ void lv_example_scroll_3(void)
{ {
lv_obj_t * list = lv_list_create(lv_scr_act()); lv_obj_t * list = lv_list_create(lv_scr_act());
lv_obj_set_size(list, 280, 220); lv_obj_set_size(list, 280, 220);
lv_obj_center(list);
for(btn_cnt = 1; btn_cnt <= 2; btn_cnt++) { for(btn_cnt = 1; btn_cnt <= 2; btn_cnt++) {
char buf[32]; char buf[32];
@@ -33,7 +34,7 @@ void lv_example_scroll_3(void)
lv_obj_t * float_btn = lv_btn_create(list, NULL); lv_obj_t * float_btn = lv_btn_create(list, NULL);
lv_obj_set_size(float_btn, 50, 50); lv_obj_set_size(float_btn, 50, 50);
lv_obj_add_flag(float_btn, LV_OBJ_FLAG_FLOATING); lv_obj_add_flag(float_btn, LV_OBJ_FLAG_FLOATING);
lv_obj_align(float_btn, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -10, -10); lv_obj_align(float_btn, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, -lv_obj_get_style_pad_right(list, LV_PART_MAIN));
lv_obj_add_event_cb(float_btn, float_btn_event_cb, list); lv_obj_add_event_cb(float_btn, float_btn_event_cb, list);
lv_obj_set_style_radius(float_btn, LV_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE); lv_obj_set_style_radius(float_btn, LV_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
lv_obj_set_style_content_text(float_btn, LV_PART_MAIN, LV_STATE_DEFAULT, LV_SYMBOL_PLUS); lv_obj_set_style_content_text(float_btn, LV_PART_MAIN, LV_STATE_DEFAULT, LV_SYMBOL_PLUS);

7
src/lv_hal/lv_hal_indev.c
View File

@@ -39,6 +39,11 @@ void lv_indev_read_task_cb(lv_timer_t * task);
/********************** /**********************
* MACROS * MACROS
**********************/ **********************/
#if LV_LOG_TRACE_INDEV
# define INDEV_TRACE(...) LV_LOG_TRACE( __VA_ARGS__)
#else
# define INDEV_TRACE(...)
#endif
/********************** /**********************
* GLOBAL FUNCTIONS * GLOBAL FUNCTIONS
@@ -151,7 +156,7 @@ bool _lv_indev_read(lv_indev_t * indev, lv_indev_data_t * data)
} }
if(indev->driver.read_cb) { if(indev->driver.read_cb) {
LV_LOG_TRACE("calling indev_read_cb"); INDEV_TRACE("calling indev_read_cb");
cont = indev->driver.read_cb(&indev->driver, data); cont = indev->driver.read_cb(&indev->driver, data);
} }
else { else {