1
0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00

Merge branch 'master' of https://github.com/fhorinek/lvgl into fhorinek-master

This commit is contained in:
Gabor Kiss-Vamosi 2020-05-23 14:54:18 +02:00
commit 7e4e5b7271

View File

@ -3604,7 +3604,7 @@ static lv_design_res_t lv_obj_design(lv_obj_t * obj, const lv_area_t * clip_area
/**
* Get the really dragged object by taking `focus_parent` into account.
* Get the really focused object by taking `focus_parent` into account.
* @param obj the start object
* @return the object to really focus
*/
@ -4041,4 +4041,3 @@ static void lv_event_mark_deleted(lv_obj_t * obj)
}
}