From 16b9e3fd961ed5b97ec6c2eb067ad664ee817bf7 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 1 Mar 2021 12:04:19 +0100 Subject: [PATCH] minor fixes --- examples/scroll/lv_example_scroll_3.c | 3 ++- src/lv_hal/lv_hal_indev.c | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/examples/scroll/lv_example_scroll_3.c b/examples/scroll/lv_example_scroll_3.c index 0b169f59f..67175b3b4 100644 --- a/examples/scroll/lv_example_scroll_3.c +++ b/examples/scroll/lv_example_scroll_3.c @@ -23,6 +23,7 @@ void lv_example_scroll_3(void) { lv_obj_t * list = lv_list_create(lv_scr_act()); lv_obj_set_size(list, 280, 220); + lv_obj_center(list); for(btn_cnt = 1; btn_cnt <= 2; btn_cnt++) { 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_set_size(float_btn, 50, 50); 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_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); diff --git a/src/lv_hal/lv_hal_indev.c b/src/lv_hal/lv_hal_indev.c index d3e6eb492..d854f2099 100644 --- a/src/lv_hal/lv_hal_indev.c +++ b/src/lv_hal/lv_hal_indev.c @@ -39,6 +39,11 @@ void lv_indev_read_task_cb(lv_timer_t * task); /********************** * MACROS **********************/ +#if LV_LOG_TRACE_INDEV +# define INDEV_TRACE(...) LV_LOG_TRACE( __VA_ARGS__) +#else +# define INDEV_TRACE(...) +#endif /********************** * GLOBAL FUNCTIONS @@ -151,7 +156,7 @@ bool _lv_indev_read(lv_indev_t * indev, lv_indev_data_t * data) } 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); } else {