Merge branch 'bugfix' into beta

lv_app/lv_app_util/lv_app_notice.c

@@ -9,8 +9,8 @@
 #include "lv_app_notice.h"
 #if USE_LV_APP_NOTICE != 0
 
-#include <lvgl/lv_objx/lv_cont.h>
-#include "lvgl/lv_objx/lv_label.h"
+#include "../../lv_objx/lv_cont.h"
+#include "../../lv_objx/lv_label.h"
 
 #include "misc/gfx/anim.h"
 #include <stdio.h>

lv_appx/lv_app_terminal.c

@@ -7,17 +7,15 @@
  *      INCLUDES
  *********************/
 
-#include <lv_conf.h>
-#include <misc/gfx/area.h>
-#include <lvgl/lv_obj/lv_dispi.h>
-#include <lvgl/lv_obj/lv_obj.h>
-#include <lvgl/lv_objx/lv_btn.h>
-#include <lvgl/lv_objx/lv_cont.h>
-#include <lvgl/lv_objx/lv_ddlist.h>
-#include <lvgl/lv_objx/lv_label.h>
-#include <lvgl/lv_objx/lv_page.h>
-#include <lvgl/lv_objx/lv_ta.h>
-#include <misc/gfx/color.h>
+#include "lv_conf.h"
+#include "../lv_obj/lv_dispi.h"
+#include "../lv_obj/lv_obj.h"
+#include "../lv_objx/lv_btn.h"
+#include "../lv_objx/lv_cont.h"
+#include "../lv_objx/lv_ddlist.h"
+#include "../lv_objx/lv_label.h"
+#include "../lv_objx/lv_page.h"
+#include "../lv_objx/lv_ta.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>

lv_draw/lv_draw_vbasic.c

@@ -15,7 +15,7 @@
 #if LV_VDB_SIZE != 0
 
 #include <stddef.h>
-#include "lvgl/lv_obj/lv_vdb.h"
+#include "../lv_obj/lv_vdb.h"
 
 /*********************
  *      INCLUDES

lv_obj/lv_obj.c

@@ -8,14 +8,13 @@
  *********************/
 
 #include "lv_conf.h"
-#include "lvgl/lv_draw/lv_draw.h"
-#include "lvgl/lv_obj/lv_dispi.h"
-#include "lvgl/lv_obj/lv_obj.h"
-#include "lvgl/lv_obj/lv_refr.h"
-#include "lvgl/lv_obj/lv_group.h"
-#include "lvgl/lv_app/lv_app.h"
-#include "lvgl/lv_draw/lv_draw_rbasic.h"
+#include "../lv_draw/lv_draw.h"
+#include "../lv_draw/lv_draw_rbasic.h"
+#include "lv_dispi.h"
+#include "lv_obj.h"
+#include "lv_refr.h"
 #include "lv_group.h"
+#include "../lv_app/lv_app.h"
 #include "misc/gfx/anim.h"
 #include "hal/indev/indev.h"
 #include <stdint.h>

lv_objx/lv_bar.c

@@ -11,7 +11,7 @@
 #include "lv_conf.h"
 #if USE_LV_BAR != 0
 
-#include <lvgl/lv_objx/lv_bar.h>
+#include "lv_bar.h"
 #include "../lv_draw/lv_draw.h"
 #include "misc/gfx/anim.h"
 #include <stdio.h>

lv_objx/lv_bar.h

@@ -17,7 +17,7 @@ extern "C" {
 #if USE_LV_BAR != 0
 
 #include "../lv_obj/lv_obj.h"
-#include <lvgl/lv_objx/lv_cont.h>
+#include "lv_cont.h"
 #include "lv_btn.h"
 #include "lv_label.h"
 

lv_objx/lv_btn.h

@@ -21,7 +21,7 @@ extern "C" {
 #error "lv_btn: lv_cont is required. Enable it in lv_conf.h (USE_LV_CONT  1) "
 #endif
 
-#include <lvgl/lv_objx/lv_cont.h>
+#include "lv_cont.h"
 #include "../lv_obj/lv_dispi.h"
 
 /*********************

lv_objx/lv_ddlist.c

@@ -12,8 +12,9 @@
 
 #include "lv_ddlist.h"
 #include "../lv_draw/lv_draw.h"
-#include "misc/gfx/anim.h"
 #include "../lv_obj/lv_group.h"
+#include "../lv_obj/lv_dispi.h"
+#include "misc/gfx/anim.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_line.h

@@ -16,7 +16,7 @@ extern "C" {
 #include "lv_conf.h"
 #if USE_LV_LINE != 0
 
-#include "lvgl/lv_obj/lv_obj.h"
+#include "../lv_obj/lv_obj.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_list.c

@@ -10,8 +10,8 @@
 #if USE_LV_LIST != 0
 
 #include "lv_list.h"
-#include "lvgl/lv_obj/lv_group.h"
-#include "lvgl/lv_objx/lv_cont.h"
+#include "../lv_obj/lv_group.h"
+#include "lv_cont.h"
 #include "misc/gfx/anim.h"
 #include "misc/math/math_base.h"
 

lv_objx/lv_mbox.c

@@ -11,7 +11,7 @@
 #if USE_LV_MBOX != 0
 
 #include "lv_mbox.h"
-#include "lvgl/lv_obj/lv_group.h"
+#include "../lv_obj/lv_group.h"
 #include "misc/gfx/anim.h"
 #include "misc/math/math_base.h"
 

lv_objx/lv_mbox.h

@@ -31,7 +31,7 @@ extern "C" {
 
 
 #include "../lv_obj/lv_obj.h"
-#include <lvgl/lv_objx/lv_cont.h>
+#include "lv_cont.h"
 #include "lv_btn.h"
 #include "lv_label.h"
 

lv_objx/lv_page.h

@@ -21,8 +21,7 @@ extern "C" {
 #error "lv_page: lv_cont is required. Enable it in lv_conf.h (USE_LV_CONT  1) "
 #endif
 
-#include "../lv_obj/lv_obj.h"
-#include "lvgl/lv_objx/lv_cont.h"
+#include "lv_cont.h"
 #include "../lv_obj/lv_dispi.h"
 
 /*********************

lv_objx/lv_slider.c

@@ -10,9 +10,9 @@
 #if USE_LV_SLIDER != 0
 
 #include "lv_slider.h"
-#include "lvgl/lv_obj/lv_group.h"
-#include "misc/math/math_base.h"
+#include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
+#include "misc/math/math_base.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_ta.c

@@ -11,9 +11,9 @@
 #if USE_LV_TA != 0
 
 #include "lv_ta.h"
-#include "lvgl/lv_obj/lv_group.h"
-#include "misc/gfx/anim.h"
+#include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
+#include "misc/gfx/anim.h"
 
 /*********************
  *      DEFINES

lv_objx/lv_win.h

@@ -35,7 +35,7 @@ extern "C" {
 #endif
 
 #include "../lv_obj/lv_obj.h"
-#include <lvgl/lv_objx/lv_cont.h>
+#include "lv_cont.h"
 #include "lv_btn.h"
 #include "lv_label.h"
 #include "lv_img.h"