Merge branch 'dev-6.0' of https://github.com/littlevgl/lvgl into dev-6.0

src/lv_core/lv_group.c

@@ -110,6 +110,7 @@ void lv_group_del(lv_group_t * group)
     }
 
     lv_ll_clear(&(group->obj_ll));
+    lv_ll_rem(&LV_GC_ROOT(_lv_group_ll), group);
     lv_mem_free(group);
 }
 

src/lv_core/lv_obj.c

@@ -1980,6 +1980,16 @@ lv_obj_user_data_t * lv_obj_get_user_data(lv_obj_t * obj)
 {
     return &obj->user_data;
 }
+
+/**
+ * Set the object's user data. The data will be copied.
+ * @param obj pointer to an object
+ * @param data user data
+ */
+void lv_obj_set_user_data(lv_obj_t * obj, lv_obj_user_data_t data)
+{
+    memcpy(&obj->user_data, &data, sizeof(lv_obj_user_data_t));
+}
 #endif
 
 #if LV_USE_GROUP

src/lv_core/lv_obj.h

@@ -919,6 +919,14 @@ void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf);
  * @return pointer to the user data
  */
 lv_obj_user_data_t * lv_obj_get_user_data(lv_obj_t * obj);
+
+/**
+ * Set the object's user data. The data will be copied.
+ * @param obj pointer to an object
+ * @param data user data
+ */
+void lv_obj_set_user_data(lv_obj_t * obj, lv_obj_user_data_t data);
+
 #endif
 
 #if LV_USE_GROUP

src/lv_hal/lv_hal_disp.c

@@ -124,14 +124,14 @@ lv_disp_t * lv_disp_drv_register(lv_disp_drv_t * driver)
     disp_def = disp; /*Temporarily change the default screen to create the default screens on the
                         new display*/
 
+    disp->inv_p = 0;
+
     disp->act_scr   = lv_obj_create(NULL, NULL); /*Create a default screen on the display*/
     disp->top_layer = lv_obj_create(NULL, NULL); /*Create top layer on the display*/
     disp->sys_layer = lv_obj_create(NULL, NULL); /*Create top layer on the display*/
     lv_obj_set_style(disp->top_layer, &lv_style_transp);
     lv_obj_set_style(disp->sys_layer, &lv_style_transp);
 
-    disp->inv_p = 0;
-
     lv_obj_invalidate(disp->act_scr);
 
     disp_def = disp_def_tmp; /*Revert the default display*/

src/lv_misc/lv_area.h

@@ -16,6 +16,11 @@ extern "C" {
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../../lv_conf.h"
+#endif
 
 /*********************
  *      DEFINES