arch: use a flatter directory structure

lvgl.h

@@ -43,30 +43,69 @@ extern "C" {
 #include "src/font/lv_font_loader.h"
 #include "src/font/lv_font_fmt_txt.h"
 
-#include "src/widgets/lv_arc.h"
-#include "src/widgets/lv_btn.h"
-#include "src/widgets/lv_img.h"
-#include "src/widgets/lv_label.h"
-#include "src/widgets/lv_line.h"
-#include "src/widgets/lv_table.h"
-#include "src/widgets/lv_checkbox.h"
-#include "src/widgets/lv_bar.h"
-#include "src/widgets/lv_slider.h"
-#include "src/widgets/lv_btnmatrix.h"
-#include "src/widgets/lv_dropdown.h"
-#include "src/widgets/lv_roller.h"
-#include "src/widgets/lv_textarea.h"
-#include "src/widgets/lv_canvas.h"
-#include "src/widgets/lv_switch.h"
+#include "src/widgets/animimg/lv_animimg.h"
+#include "src/widgets/arc/lv_arc.h"
+#include "src/widgets/bar/lv_bar.h"
+#include "src/widgets/btn/lv_btn.h"
+#include "src/widgets/btnmatrix/lv_btnmatrix.h"
+#include "src/widgets/calendar/lv_calendar.h"
+#include "src/widgets/canvas/lv_canvas.h"
+#include "src/widgets/chart/lv_chart.h"
+#include "src/widgets/checkbox/lv_checkbox.h"
+#include "src/widgets/colorwheel/lv_colorwheel.h"
+#include "src/widgets/dropdown/lv_dropdown.h"
+#include "src/widgets/img/lv_img.h"
+#include "src/widgets/imgbtn/lv_imgbtn.h"
+#include "src/widgets/keyboard/lv_keyboard.h"
+#include "src/widgets/label/lv_label.h"
+#include "src/widgets/led/lv_led.h"
+#include "src/widgets/line/lv_line.h"
+#include "src/widgets/list/lv_list.h"
+#include "src/widgets/menu/lv_menu.h"
+#include "src/widgets/meter/lv_meter.h"
+#include "src/widgets/msgbox/lv_msgbox.h"
+#include "src/widgets/roller/lv_roller.h"
+#include "src/widgets/slider/lv_slider.h"
+#include "src/widgets/span/lv_span.h"
+#include "src/widgets/spinbox/lv_spinbox.h"
+#include "src/widgets/spinner/lv_spinner.h"
+#include "src/widgets/switch/lv_switch.h"
+#include "src/widgets/table/lv_table.h"
+#include "src/widgets/tabview/lv_tabview.h"
+#include "src/widgets/textarea/lv_textarea.h"
+#include "src/widgets/tileview/lv_tileview.h"
+#include "src/widgets/win/lv_win.h"
+
+#include "src/others/snapshot/lv_snapshot.h"
+#include "src/others/monkey/lv_monkey.h"
+#include "src/others/gridnav/lv_gridnav.h"
+#include "src/others/fragment/lv_fragment.h"
+#include "src/others/imgfont/lv_imgfont.h"
+#include "src/others/msg/lv_msg.h"
+#include "src/others/ime/lv_ime_pinyin.h"
+
+#include "src/libs/bmp/lv_bmp.h"
+#include "src/libs/fsdrv/lv_fsdrv.h"
+#include "src/libs/png/lv_png.h"
+#include "src/libs/gif/lv_gif.h"
+#include "src/libs/qrcode/lv_qrcode.h"
+#include "src/libs/sjpg/lv_sjpg.h"
+#include "src/libs/freetype/lv_freetype.h"
+#include "src/libs/rlottie/lv_rlottie.h"
+#include "src/libs/ffmpeg/lv_ffmpeg.h"
+
+#include "src/layouts/flex/lv_flex.h"
+#include "src/layouts/grid/lv_grid.h"
 
 #include "src/draw/lv_draw.h"
 
+#include "src/themes/lv_themes.h"
+
 #include "src/lv_api_map.h"
 
 /*-----------------
  * EXTRAS
  *----------------*/
-#include "src/extra/lv_extra.h"
 
 /*********************
  *      DEFINES

lvgl.mk

@@ -1,9 +1,4 @@
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos/lv_demos.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples/lv_examples.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_core.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/lv_extra.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal/lv_hal.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_misc.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_widgets.mk
+CSRCS += $(shell find $(LVGL_DIR_NAME)/src -type f -name '*.c')
+CSRCS += $(shell find $(LVGL_DIR_NAME)/demos -type f -name '*.c')
+CSRCS += $(shell find $(LVGL_DIR_NAME)/examples -type f -name '*.c')
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)"

src/core/lv_obj.c

@@ -21,11 +21,20 @@
 #include "../misc/lv_gc.h"
 #include "../misc/lv_math.h"
 #include "../misc/lv_log.h"
+#include "../libs/bmp/lv_bmp.h"
+#include "../libs/ffmpeg/lv_ffmpeg.h"
+#include "../libs/freetype/lv_freetype.h"
+#include "../libs/fsdrv/lv_fsdrv.h"
+#include "../libs/gif/lv_gif.h"
+#include "../libs/png/lv_png.h"
+#include "../libs/sjpg/lv_sjpg.h"
+#include "../layouts/flex/lv_flex.h"
+#include "../layouts/grid/lv_grid.h"
+
 #if LV_USE_BUILTIN_MALLOC
     #include "../misc/lv_mem_builtin.h"
 #endif
 #include "../hal/lv_hal.h"
-#include "../extra/lv_extra.h"
 #include <stdint.h>
 #include <string.h>
 
@@ -180,7 +189,59 @@ void lv_init(void)
     LV_LOG_WARN("Log level is set to 'Trace' which makes LVGL much slower");
 #endif
 
-    lv_extra_init();
+
+#if LV_USE_FLEX
+    lv_flex_init();
+#endif
+
+#if LV_USE_GRID
+    lv_grid_init();
+#endif
+
+#if LV_USE_MSG
+    lv_msg_init();
+#endif
+
+#if LV_USE_FS_FATFS != '\0'
+    lv_fs_fatfs_init();
+#endif
+
+#if LV_USE_FS_STDIO != '\0'
+    lv_fs_stdio_init();
+#endif
+
+#if LV_USE_FS_POSIX != '\0'
+    lv_fs_posix_init();
+#endif
+
+#if LV_USE_FS_WIN32 != '\0'
+    lv_fs_win32_init();
+#endif
+
+#if LV_USE_FFMPEG
+    lv_ffmpeg_init();
+#endif
+
+#if LV_USE_PNG
+    lv_png_init();
+#endif
+
+#if LV_USE_SJPG
+    lv_split_jpeg_init();
+#endif
+
+#if LV_USE_BMP
+    lv_bmp_init();
+#endif
+
+#if LV_USE_FREETYPE
+    /*Init freetype library*/
+#  if LV_FREETYPE_CACHE_SIZE >= 0
+    lv_freetype_init(LV_FREETYPE_CACHE_FT_FACES, LV_FREETYPE_CACHE_FT_SIZES, LV_FREETYPE_CACHE_SIZE);
+#  else
+    lv_freetype_init(0, 0, 0);
+#  endif
+#endif
 
     lv_initialized = true;
 

src/core/lv_refr.c

@@ -17,10 +17,10 @@
 #include "../misc/lv_gc.h"
 #include "../draw/lv_draw.h"
 #include "../font/lv_font_fmt_txt.h"
-#include "../extra/others/snapshot/lv_snapshot.h"
+#include "../others/snapshot/lv_snapshot.h"
 
 #if LV_USE_PERF_MONITOR || LV_USE_MEM_MONITOR
-    #include "../widgets/lv_label.h"
+    #include "../widgets/label/lv_label.h"
 #endif
 
 /*********************

src/extra/README.md

@@ -1,31 +0,0 @@
-# Extra components
-
-This directory contains extra (optional) components to lvgl.
-It's a good place for contributions as there are less strict expectations about the completeness and flexibility of the components here.
-
-In other words, if you have created a complex widget from other widgets, or modified an existing widget with special events, styles or animations, or have a new feature that could work as a plugin to lvgl feel free to the share it here.
-
-## How to contribute
-- Create a [Pull request](https://docs.lvgl.io/8.0/CONTRIBUTING.html#pull-request) with your new content
-- Please and follow the [Coding style](https://github.com/lvgl/lvgl/blob/master/docs/CODING_STYLE.md) of LVGL
-- Add setter/getter functions in pair
-- Update [lv_conf_template.h](https://github.com/lvgl/lvgl/blob/master/lv_conf_template.h)
-- Add description in the [docs](https://github.com/lvgl/lvgl/tree/master/docs)
-- Add [examples](https://github.com/lvgl/lvgl/tree/master/examples)
-- Update the [changelog](https://github.com/lvgl/lvgl/tree/master/docs/CHANGELOG.md)
-- Add yourself to the [Contributors](#contributors) section below.
-
-## Ideas
-Here some ideas as inspiration feel free to contribute with ideas too.
-- New [Calendar headers](https://github.com/lvgl/lvgl/tree/master/src/extra/widgets/calendar)
-- Color picker with RGB and or HSV bars
-- Ruler, horizontal or vertical with major and minor ticks and labels
-- New [List items types](https://github.com/lvgl/lvgl/tree/master/src/extra/widgets/list)
-- [Preloaders](https://www.google.com/search?q=preloader&sxsrf=ALeKk01ddA4YB0WEgLLN1bZNSm8YER7pkg:1623080551559&source=lnms&tbm=isch&sa=X&ved=2ahUKEwiwoN6d7oXxAhVuw4sKHVedBB4Q_AUoAXoECAEQAw&biw=952&bih=940)
-- Drop-down list with a container to which content can be added
-- 9 patch button: Similar to [lv_imgbtn](https://docs.lvgl.io/8.0/widgets/extra/imgbtn.html) but 9 images for 4 corner, 4 sides and the center
-
-## Contributors
-- lv_animimg: @ZhaoQiang-b45475
-- lv_span: @guoweilkd
-- lv_menu: @HX2003

src/extra/layouts/lv_layouts.h

@@ -1,44 +0,0 @@
-/**
- * @file lv_layouts.h
- *
- */
-
-#ifndef LV_LAYOUTS_H
-#define LV_LAYOUTS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "flex/lv_flex.h"
-#include "grid/lv_grid.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-#if LV_USE_LOG && LV_LOG_TRACE_LAYOUT
-#  define LV_TRACE_LAYOUT(...) LV_LOG_TRACE(__VA_ARGS__)
-#else
-#  define LV_TRACE_LAYOUT(...)
-#endif
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_LAYOUTS_H*/

src/extra/libs/lv_libs.h

@@ -1,46 +0,0 @@
-/**
- * @file lv_libs.h
- *
- */
-
-#ifndef LV_LIBS_H
-#define LV_LIBS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "bmp/lv_bmp.h"
-#include "fsdrv/lv_fsdrv.h"
-#include "png/lv_png.h"
-#include "gif/lv_gif.h"
-#include "qrcode/lv_qrcode.h"
-#include "sjpg/lv_sjpg.h"
-#include "freetype/lv_freetype.h"
-#include "rlottie/lv_rlottie.h"
-#include "ffmpeg/lv_ffmpeg.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_LIBS_H*/

src/extra/libs/sjpg/tjpgd.h

@@ -1,93 +0,0 @@
-/*----------------------------------------------------------------------------/
-/ TJpgDec - Tiny JPEG Decompressor R0.03 include file         (C)ChaN, 2021
-/----------------------------------------------------------------------------*/
-#ifndef DEF_TJPGDEC
-#define DEF_TJPGDEC
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "../../../lv_conf_internal.h"
-#if LV_USE_SJPG
-
-#include "tjpgdcnf.h"
-#include <string.h>
-#include <stdint.h>
-
-#if JD_FASTDECODE >= 1
-typedef int16_t jd_yuv_t;
-#else
-typedef uint8_t jd_yuv_t;
-#endif
-
-
-/* Error code */
-typedef enum {
-	JDR_OK = 0,	/* 0: Succeeded */
-	JDR_INTR,	/* 1: Interrupted by output function */	
-	JDR_INP,	/* 2: Device error or wrong termination of input stream */
-	JDR_MEM1,	/* 3: Insufficient memory pool for the image */
-	JDR_MEM2,	/* 4: Insufficient stream input buffer */
-	JDR_PAR,	/* 5: Parameter error */
-	JDR_FMT1,	/* 6: Data format error (may be broken data) */
-	JDR_FMT2,	/* 7: Right format but not supported */
-	JDR_FMT3	/* 8: Not supported JPEG standard */
-} JRESULT;
-
-/* Rectangular region in the output image */
-typedef struct {
-	uint16_t left;		/* Left end */
-	uint16_t right;		/* Right end */
-	uint16_t top;		/* Top end */
-	uint16_t bottom;	/* Bottom end */
-} JRECT;
-
-/* Decompressor object structure */
-typedef struct JDEC JDEC;
-struct JDEC {
-	size_t dctr;				/* Number of bytes available in the input buffer */
-	uint8_t* dptr;				/* Current data read ptr */
-	uint8_t* inbuf;				/* Bit stream input buffer */
-	uint8_t dbit;				/* Number of bits availavble in wreg or reading bit mask */
-	uint8_t scale;				/* Output scaling ratio */
-	uint8_t msx, msy;			/* MCU size in unit of block (width, height) */
-	uint8_t qtid[3];			/* Quantization table ID of each component, Y, Cb, Cr */
-	uint8_t ncomp;				/* Number of color components 1:grayscale, 3:color */
-	int16_t dcv[3];				/* Previous DC element of each component */
-	uint16_t nrst;				/* Restart inverval */
-	uint16_t width, height;		/* Size of the input image (pixel) */
-	uint8_t* huffbits[2][2];	/* Huffman bit distribution tables [id][dcac] */
-	uint16_t* huffcode[2][2];	/* Huffman code word tables [id][dcac] */
-	uint8_t* huffdata[2][2];	/* Huffman decoded data tables [id][dcac] */
-	int32_t* qttbl[4];			/* Dequantizer tables [id] */
-#if JD_FASTDECODE >= 1
-	uint32_t wreg;				/* Working shift register */
-	uint8_t marker;				/* Detected marker (0:None) */
-#if JD_FASTDECODE == 2
-	uint8_t longofs[2][2];		/* Table offset of long code [id][dcac] */
-	uint16_t* hufflut_ac[2];	/* Fast huffman decode tables for AC short code [id] */
-	uint8_t* hufflut_dc[2];		/* Fast huffman decode tables for DC short code [id] */
-#endif
-#endif
-	void* workbuf;				/* Working buffer for IDCT and RGB output */
-	jd_yuv_t* mcubuf;			/* Working buffer for the MCU */
-	void* pool;					/* Pointer to available memory pool */
-	size_t sz_pool;				/* Size of momory pool (bytes available) */
-	size_t (*infunc)(JDEC*, uint8_t*, size_t);	/* Pointer to jpeg stream input function */
-	void* device;				/* Pointer to I/O device identifiler for the session */
-};
-
-
-
-/* TJpgDec API functions */
-JRESULT jd_prepare (JDEC* jd, size_t (*infunc)(JDEC*,uint8_t*,size_t), void* pool, size_t sz_pool, void* dev);
-JRESULT jd_decomp (JDEC* jd, int (*outfunc)(JDEC*,void*,JRECT*), uint8_t scale);
-
-#endif /*LV_USE_SJPG*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _TJPGDEC */

src/extra/lv_extra.c

@@ -1,93 +0,0 @@
-/**
- * @file lv_extra.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "../lvgl.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-void lv_extra_init(void)
-{
-#if LV_USE_FLEX
-    lv_flex_init();
-#endif
-
-#if LV_USE_GRID
-    lv_grid_init();
-#endif
-
-#if LV_USE_MSG
-    lv_msg_init();
-#endif
-
-#if LV_USE_FS_FATFS != '\0'
-    lv_fs_fatfs_init();
-#endif
-
-#if LV_USE_FS_STDIO != '\0'
-    lv_fs_stdio_init();
-#endif
-
-#if LV_USE_FS_POSIX != '\0'
-    lv_fs_posix_init();
-#endif
-
-#if LV_USE_FS_WIN32 != '\0'
-    lv_fs_win32_init();
-#endif
-
-#if LV_USE_FFMPEG
-    lv_ffmpeg_init();
-#endif
-
-#if LV_USE_PNG
-    lv_png_init();
-#endif
-
-#if LV_USE_SJPG
-    lv_split_jpeg_init();
-#endif
-
-#if LV_USE_BMP
-    lv_bmp_init();
-#endif
-
-#if LV_USE_FREETYPE
-    /*Init freetype library*/
-#  if LV_FREETYPE_CACHE_SIZE >= 0
-    lv_freetype_init(LV_FREETYPE_CACHE_FT_FACES, LV_FREETYPE_CACHE_FT_SIZES, LV_FREETYPE_CACHE_SIZE);
-#  else
-    lv_freetype_init(0, 0, 0);
-#  endif
-#endif
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/

src/extra/lv_extra.h

@@ -1,48 +0,0 @@
-/**
- * @file lv_extra.h
- *
- */
-
-#ifndef LV_EXTRA_H
-#define LV_EXTRA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "layouts/lv_layouts.h"
-#include "libs/lv_libs.h"
-#include "others/lv_others.h"
-#include "themes/lv_themes.h"
-#include "widgets/lv_widgets.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**
- * Initialize the extra components
- */
-void lv_extra_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_EXTRA_H*/

src/extra/lv_extra.mk

@@ -1 +0,0 @@
-CSRCS += $(shell find -L $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra -name \*.c)

src/extra/others/lv_others.h

@@ -1,44 +0,0 @@
-/**
- * @file lv_others.h
- *
- */
-
-#ifndef LV_OTHERS_H
-#define LV_OTHERS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "snapshot/lv_snapshot.h"
-#include "monkey/lv_monkey.h"
-#include "gridnav/lv_gridnav.h"
-#include "fragment/lv_fragment.h"
-#include "imgfont/lv_imgfont.h"
-#include "msg/lv_msg.h"
-#include "ime/lv_ime_pinyin.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_OTHERS_H*/

src/extra/widgets/lv_widgets.h

@@ -1,56 +0,0 @@
-/**
- * @file lv_widgets.h
- *
- */
-
-#ifndef LV_WIDGETS_H
-#define LV_WIDGETS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "animimg/lv_animimg.h"
-#include "calendar/lv_calendar.h"
-#include "calendar/lv_calendar_header_arrow.h"
-#include "calendar/lv_calendar_header_dropdown.h"
-#include "chart/lv_chart.h"
-#include "keyboard/lv_keyboard.h"
-#include "list/lv_list.h"
-#include "menu/lv_menu.h"
-#include "msgbox/lv_msgbox.h"
-#include "meter/lv_meter.h"
-#include "spinbox/lv_spinbox.h"
-#include "spinner/lv_spinner.h"
-#include "tabview/lv_tabview.h"
-#include "tileview/lv_tileview.h"
-#include "win/lv_win.h"
-#include "colorwheel/lv_colorwheel.h"
-#include "led/lv_led.h"
-#include "imgbtn/lv_imgbtn.h"
-#include "span/lv_span.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*LV_WIDGETS_H*/

src/hal/lv_hal_disp.c

@@ -28,7 +28,7 @@
 #endif
 
 #if LV_USE_THEME_DEFAULT
-    #include "../extra/themes/default/lv_theme_default.h"
+    #include "../themes/default/lv_theme_default.h"
 #endif
 
 /*********************

src/layouts/flex/lv_flex.c

@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_layouts.h"
+#include "lv_flex.h"
 
 #if LV_USE_FLEX
 
@@ -72,7 +72,6 @@ lv_style_prop_t LV_STYLE_FLEX_CROSS_PLACE;
 lv_style_prop_t LV_STYLE_FLEX_TRACK_PLACE;
 lv_style_prop_t LV_STYLE_FLEX_GROW;
 
-
 /**********************
  *  STATIC VARIABLES
  **********************/
@@ -80,6 +79,11 @@ lv_style_prop_t LV_STYLE_FLEX_GROW;
 /**********************
  *      MACROS
  **********************/
+#if LV_USE_LOG && LV_LOG_TRACE_LAYOUT
+    #define LV_TRACE_LAYOUT(...) LV_LOG_TRACE(__VA_ARGS__)
+#else
+    #define LV_TRACE_LAYOUT(...)
+#endif
 
 /**********************
  *   GLOBAL FUNCTIONS

src/layouts/flex/lv_flex.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 #if LV_USE_FLEX
 
 /*********************

src/layouts/grid/lv_grid.c

@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_layouts.h"
+#include "lv_grid.h"
 
 #if LV_USE_GRID
 
@@ -40,7 +40,6 @@ typedef struct {
     lv_coord_t grid_h;
 } _lv_grid_calc_t;
 
-
 /**********************
  *  GLOBAL PROTOTYPES
  **********************/
@@ -121,6 +120,11 @@ lv_style_prop_t LV_STYLE_GRID_CELL_Y_ALIGN;
 /**********************
  *      MACROS
  **********************/
+#if LV_USE_LOG && LV_LOG_TRACE_LAYOUT
+    #define LV_TRACE_LAYOUT(...) LV_LOG_TRACE(__VA_ARGS__)
+#else
+    #define LV_TRACE_LAYOUT(...)
+#endif
 
 /**********************
  *   GLOBAL FUNCTIONS

src/layouts/grid/lv_grid.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 #if LV_USE_GRID
 
 /*********************

src/libs/bmp/lv_bmp.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 #if LV_USE_BMP
 
 /*********************

src/libs/fsdrv/lv_fsdrv.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 
 /*********************
  *      DEFINES

src/libs/gif/gifdec.c

@@ -1,7 +1,7 @@
 #include "gifdec.h"
-#include "../../../misc/lv_log.h"
-#include "../../../misc/lv_mem.h"
-#include "../../../misc/lv_color.h"
+#include "../../misc/lv_log.h"
+#include "../../misc/lv_mem.h"
+#include "../../misc/lv_color.h"
 #if LV_USE_GIF
 
 #include <stdlib.h>
@@ -197,7 +197,8 @@ read_plain_text_ext(gd_GIF *gif)
         sub_block = f_gif_seek(gif, 0, LV_FS_SEEK_CUR);
         gif->plain_text(gif, tx, ty, tw, th, cw, ch, fg, bg);
         f_gif_seek(gif, sub_block, LV_FS_SEEK_SET);
-    } else {
+    }
+    else {
         /* Discard plain text metadata. */
         f_gif_seek(gif, 13, LV_FS_SEEK_CUR);
     }
@@ -252,12 +253,14 @@ read_application_ext(gd_GIF *gif)
         gif->loop_count = read_num(gif);
         /* Skip block terminator. */
         f_gif_seek(gif, 1, LV_FS_SEEK_CUR);
-    } else if (gif->application) {
+    }
+    else if(gif->application) {
         size_t sub_block = f_gif_seek(gif, 0, LV_FS_SEEK_CUR);
         gif->application(gif, app_id, app_auth_code);
         f_gif_seek(gif, sub_block, LV_FS_SEEK_SET);
         discard_sub_blocks(gif);
-    } else {
+    }
+    else {
         discard_sub_blocks(gif);
     }
 }
@@ -297,7 +300,9 @@ new_table(int key_size)
         table->nentries = (1 << key_size) + 2;
         table->entries = (Entry *) &table[1];
         for(key = 0; key < (1 << key_size); key++)
-            table->entries[key] = (Entry) {1, 0xFFF, key};
+            table->entries[key] = (Entry) {
+            1, 0xFFF, key
+        };
     }
     return table;
 }
@@ -317,7 +322,9 @@ add_entry(Table **tablep, uint16_t length, uint16_t prefix, uint8_t suffix)
         table->entries = (Entry *) &table[1];
         *tablep = table;
     }
-    table->entries[table->nentries] = (Entry) {length, prefix, suffix};
+    table->entries[table->nentries] = (Entry) {
+        length, prefix, suffix
+    };
     table->nentries++;
     if((table->nentries & (table->nentries - 1)) == 0)
         return 1;
@@ -410,7 +417,8 @@ read_image_data(gd_GIF *gif, int interlace)
             key_size = init_key_size;
             table->nentries = (1 << (key_size - 1)) + 2;
             table_is_full = 0;
-        } else if (!table_is_full) {
+        }
+        else if(!table_is_full) {
             ret = add_entry(&table, str_len + 1, key, entry.suffix);
             if(ret == -1) {
                 lv_free(table);
@@ -471,7 +479,8 @@ read_image(gd_GIF *gif)
         gif->lct.size = 1 << ((fisrz & 0x07) + 1);
         f_gif_read(gif, gif->lct.colors, 3 * gif->lct.size);
         gif->palette = &gif->lct;
-    } else
+    }
+    else
         gif->palette = &gif->gct;
     /* Image Data. */
     return read_image_data(gif, interlace);
@@ -618,7 +627,8 @@ static bool f_gif_open(gd_GIF * gif, const void * path, bool is_file)
         lv_fs_res_t res = lv_fs_open(&gif->fd, path, LV_FS_MODE_RD);
         if(res != LV_FS_RES_OK) return false;
         else return true;
-    } else {
+    }
+    else {
         gif->data = path;
         return true;
     }
@@ -628,8 +638,8 @@ static void f_gif_read(gd_GIF * gif, void * buf, size_t len)
 {
     if(gif->is_file) {
         lv_fs_read(&gif->fd, buf, len, NULL);
-    } else
-    {
+    }
+    else {
         memcpy(buf, &gif->data[gif->f_rw_p], len);
         gif->f_rw_p += len;
     }
@@ -642,7 +652,8 @@ static int f_gif_seek(gd_GIF * gif, size_t pos, int k)
         uint32_t x;
         lv_fs_tell(&gif->fd, &x);
         return x;
-    } else {
+    }
+    else {
         if(k == LV_FS_SEEK_CUR) gif->f_rw_p += pos;
         else if(k == LV_FS_SEEK_SET) gif->f_rw_p = pos;
         return gif->f_rw_p;

src/libs/gif/gifdec.h

@@ -2,7 +2,7 @@
 #define GIFDEC_H
 
 #include <stdint.h>
-#include "../../../misc/lv_fs.h"
+#include "../../misc/lv_fs.h"
 
 #if LV_USE_GIF
 

src/libs/png/lodepng.h

@@ -211,7 +211,8 @@ unsigned lodepng_encode24_file(const char* filename,
 
 
 #ifdef LODEPNG_COMPILE_CPP
-namespace lodepng {
+namespace lodepng
+{
 #ifdef LODEPNG_COMPILE_DECODER
 /*Same as lodepng_decode_memory, but decodes to an std::vector. The colortype
 is the format to output the pixels to. Default is RGBA 8-bit per channel.*/
@@ -304,7 +305,7 @@ Settings for zlib compression. Tweaking these settings tweaks the balance
 between speed and compression ratio.
 */
 typedef struct LodePNGCompressSettings LodePNGCompressSettings;
-struct LodePNGCompressSettings /*deflate = compress*/ {
+struct LodePNGCompressSettings { /*deflate = compress*/
     /*LZ77 related settings*/
     unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). Should be 2 for proper compression.*/
     unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper compression.*/
@@ -710,7 +711,8 @@ typedef struct LodePNGColorStats {
     unsigned short key_b;
     unsigned alpha; /*image is not opaque and alpha channel or alpha palette required*/
     unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16 or allow_palette is disabled.*/
-  unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order, only valid when numcolors is valid*/
+    unsigned char
+    palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order, only valid when numcolors is valid*/
     unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for grayscale only. 16 if 16-bit per channel required.*/
     size_t numpixels;
 
@@ -895,7 +897,8 @@ const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const
 
 /*Finds the first chunk with the given type in the range [chunk, end), or returns NULL if not found.*/
 unsigned char * lodepng_chunk_find(unsigned char * chunk, unsigned char * end, const char type[5]);
-const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]);
+const unsigned char * lodepng_chunk_find_const(const unsigned char * chunk, const unsigned char * end,
+                                               const char type[5]);
 
 /*
 Appends chunk to the data in out. The given chunk should already have its chunk header.
@@ -994,9 +997,11 @@ unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const
 
 #ifdef LODEPNG_COMPILE_CPP
 /* The LodePNG C++ wrapper uses std::vectors instead of manually allocated memory buffers. */
-namespace lodepng {
+namespace lodepng
+{
 #ifdef LODEPNG_COMPILE_PNG
-class State : public LodePNGState {
+class State : public LodePNGState
+{
     public:
         State();
         State(const State & other);

src/libs/png/lv_png.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 #if LV_USE_PNG
 
 /*********************

src/libs/sjpg/lv_sjpg.c

@@ -50,7 +50,7 @@
 
 #include "tjpgd.h"
 #include "lv_sjpg.h"
-#include "../../../misc/lv_fs.h"
+#include "../../misc/lv_fs.h"
 
 /*********************
  *      DEFINES

src/libs/sjpg/tjpgd.h

@@ -0,0 +1,93 @@
+/*----------------------------------------------------------------------------/
+/ TJpgDec - Tiny JPEG Decompressor R0.03 include file         (C)ChaN, 2021
+/----------------------------------------------------------------------------*/
+#ifndef DEF_TJPGDEC
+#define DEF_TJPGDEC
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../../lv_conf_internal.h"
+#if LV_USE_SJPG
+
+#include "tjpgdcnf.h"
+#include <string.h>
+#include <stdint.h>
+
+#if JD_FASTDECODE >= 1
+typedef int16_t jd_yuv_t;
+#else
+typedef uint8_t jd_yuv_t;
+#endif
+
+
+/* Error code */
+typedef enum {
+    JDR_OK = 0, /* 0: Succeeded */
+    JDR_INTR,   /* 1: Interrupted by output function */
+    JDR_INP,    /* 2: Device error or wrong termination of input stream */
+    JDR_MEM1,   /* 3: Insufficient memory pool for the image */
+    JDR_MEM2,   /* 4: Insufficient stream input buffer */
+    JDR_PAR,    /* 5: Parameter error */
+    JDR_FMT1,   /* 6: Data format error (may be broken data) */
+    JDR_FMT2,   /* 7: Right format but not supported */
+    JDR_FMT3    /* 8: Not supported JPEG standard */
+} JRESULT;
+
+/* Rectangular region in the output image */
+typedef struct {
+    uint16_t left;      /* Left end */
+    uint16_t right;     /* Right end */
+    uint16_t top;       /* Top end */
+    uint16_t bottom;    /* Bottom end */
+} JRECT;
+
+/* Decompressor object structure */
+typedef struct JDEC JDEC;
+struct JDEC {
+    size_t dctr;                /* Number of bytes available in the input buffer */
+    uint8_t * dptr;             /* Current data read ptr */
+    uint8_t * inbuf;            /* Bit stream input buffer */
+    uint8_t dbit;               /* Number of bits availavble in wreg or reading bit mask */
+    uint8_t scale;              /* Output scaling ratio */
+    uint8_t msx, msy;           /* MCU size in unit of block (width, height) */
+    uint8_t qtid[3];            /* Quantization table ID of each component, Y, Cb, Cr */
+    uint8_t ncomp;              /* Number of color components 1:grayscale, 3:color */
+    int16_t dcv[3];             /* Previous DC element of each component */
+    uint16_t nrst;              /* Restart inverval */
+    uint16_t width, height;     /* Size of the input image (pixel) */
+    uint8_t * huffbits[2][2];   /* Huffman bit distribution tables [id][dcac] */
+    uint16_t * huffcode[2][2];  /* Huffman code word tables [id][dcac] */
+    uint8_t * huffdata[2][2];   /* Huffman decoded data tables [id][dcac] */
+    int32_t * qttbl[4];         /* Dequantizer tables [id] */
+#if JD_FASTDECODE >= 1
+    uint32_t wreg;              /* Working shift register */
+    uint8_t marker;             /* Detected marker (0:None) */
+#if JD_FASTDECODE == 2
+    uint8_t longofs[2][2];      /* Table offset of long code [id][dcac] */
+    uint16_t * hufflut_ac[2];   /* Fast huffman decode tables for AC short code [id] */
+    uint8_t * hufflut_dc[2];    /* Fast huffman decode tables for DC short code [id] */
+#endif
+#endif
+    void * workbuf;             /* Working buffer for IDCT and RGB output */
+    jd_yuv_t * mcubuf;          /* Working buffer for the MCU */
+    void * pool;                /* Pointer to available memory pool */
+    size_t sz_pool;             /* Size of momory pool (bytes available) */
+    size_t (*infunc)(JDEC *, uint8_t *, size_t); /* Pointer to jpeg stream input function */
+    void * device;              /* Pointer to I/O device identifiler for the session */
+};
+
+
+
+/* TJpgDec API functions */
+JRESULT jd_prepare(JDEC * jd, size_t (*infunc)(JDEC *, uint8_t *, size_t), void * pool, size_t sz_pool, void * dev);
+JRESULT jd_decomp(JDEC * jd, int (*outfunc)(JDEC *, void *, JRECT *), uint8_t scale);
+
+#endif /*LV_USE_SJPG*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _TJPGDEC */

src/others/fragment/lv_fragment.h

@@ -13,11 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_conf_internal.h"
+#include "../../core/lv_obj.h"
 
 #if LV_USE_FRAGMENT
 
-#include "../../../core/lv_obj.h"
 
 /*********************
  *      DEFINES

src/others/fragment/lv_fragment_manager.c

@@ -11,7 +11,7 @@
 
 #if LV_USE_FRAGMENT
 
-#include "../../../misc/lv_ll.h"
+#include "../../misc/lv_ll.h"
 
 /*********************
  *      DEFINES

src/others/gridnav/lv_gridnav.c

@@ -9,9 +9,9 @@
 #include "lv_gridnav.h"
 #if LV_USE_GRIDNAV
 
-#include "../../../misc/lv_assert.h"
-#include "../../../misc/lv_math.h"
-#include "../../../core/lv_indev.h"
+#include "../../misc/lv_assert.h"
+#include "../../misc/lv_math.h"
+#include "../../core/lv_indev.h"
 
 /*********************
  *      DEFINES

src/others/gridnav/lv_gridnav.h

@@ -53,7 +53,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 
 #if LV_USE_GRIDNAV
 

src/others/msg/lv_msg.c

@@ -9,8 +9,8 @@
 #include "lv_msg.h"
 #if LV_USE_MSG
 
-#include "../../../misc/lv_assert.h"
-#include "../../../misc/lv_ll.h"
+#include "../../misc/lv_assert.h"
+#include "../../misc/lv_ll.h"
 
 /*********************
  *      DEFINES

src/others/msg/lv_msg.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 #if LV_USE_MSG
 
 /*********************

src/others/snapshot/lv_snapshot.h

@@ -16,8 +16,7 @@ extern "C" {
 #include <stdint.h>
 #include <stddef.h>
 
-#include "../../../lv_conf_internal.h"
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 
 /*********************
  *      DEFINES

src/themes/basic/lv_theme_basic.c

@@ -11,7 +11,7 @@
 #if LV_USE_THEME_BASIC
 
 #include "lv_theme_basic.h"
-#include "../../../misc/lv_gc.h"
+#include "../../misc/lv_gc.h"
 
 /*********************
  *      DEFINES

src/themes/basic/lv_theme_basic.h

@@ -13,7 +13,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
+#include "../../core/lv_theme.h"
 
 #if LV_USE_THEME_BASIC
 

src/themes/default/lv_theme_default.c

@@ -11,7 +11,7 @@
 #if LV_USE_THEME_DEFAULT
 
 #include "lv_theme_default.h"
-#include "../../../misc/lv_gc.h"
+#include "../../misc/lv_gc.h"
 
 /*********************
  *      DEFINES

src/themes/default/lv_theme_default.h

@@ -13,7 +13,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
+#include "../../core/lv_theme.h"
 
 #if LV_USE_THEME_DEFAULT
 

src/themes/mono/lv_theme_mono.c

@@ -11,7 +11,7 @@
 #if LV_USE_THEME_MONO
 
 #include "lv_theme_mono.h"
-#include "../../../misc/lv_gc.h"
+#include "../../misc/lv_gc.h"
 
 /*********************
  *      DEFINES

src/themes/mono/lv_theme_mono.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 
 #if LV_USE_THEME_MONO
 

src/widgets/animimg/lv_animimg.c

@@ -14,13 +14,13 @@
     #error "lv_animimg: lv_img is required. Enable it in lv_conf.h (LV_USE_IMG  1) "
 #endif
 
-#include "../../../misc/lv_assert.h"
-#include "../../../draw/lv_img_decoder.h"
-#include "../../../misc/lv_fs.h"
-#include "../../../misc/lv_txt.h"
-#include "../../../misc/lv_math.h"
-#include "../../../misc/lv_log.h"
-#include "../../../misc/lv_anim.h"
+#include "../../draw/lv_img_decoder.h"
+#include "../../misc/lv_assert.h"
+#include "../../misc/lv_fs.h"
+#include "../../misc/lv_txt.h"
+#include "../../misc/lv_math.h"
+#include "../../misc/lv_log.h"
+#include "../../misc/lv_anim.h"
 
 /*********************
  *      DEFINES

src/widgets/animimg/lv_animimg.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lvgl.h"
+#include "../img/lv_img.h"
 
 #if LV_USE_ANIMIMG != 0
 

src/widgets/arc/lv_arc.c

@@ -9,11 +9,11 @@
 #include "lv_arc.h"
 #if LV_USE_ARC != 0
 
-#include "../core/lv_group.h"
-#include "../core/lv_indev.h"
-#include "../misc/lv_assert.h"
-#include "../misc/lv_math.h"
-#include "../draw/lv_draw_arc.h"
+#include "../../core/lv_group.h"
+#include "../../core/lv_indev.h"
+#include "../../misc/lv_assert.h"
+#include "../../misc/lv_math.h"
+#include "../../draw/lv_draw_arc.h"
 
 /*********************
  *      DEFINES

src/widgets/arc/lv_arc.h

@@ -13,11 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_ARC != 0
 
-#include "../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 
 /*********************
  *      DEFINES

src/widgets/bar/lv_bar.c

@@ -9,10 +9,10 @@
 #include "lv_bar.h"
 #if LV_USE_BAR != 0
 
-#include "../misc/lv_assert.h"
-#include "../draw/lv_draw.h"
-#include "../misc/lv_anim.h"
-#include "../misc/lv_math.h"
+#include "../../draw/lv_draw.h"
+#include "../../misc/lv_assert.h"
+#include "../../misc/lv_anim.h"
+#include "../../misc/lv_math.h"
 
 /*********************
  *      DEFINES

src/widgets/bar/lv_bar.h

@@ -13,14 +13,13 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_BAR != 0
 
-#include "../core/lv_obj.h"
-#include "../misc/lv_anim.h"
-#include "lv_btn.h"
-#include "lv_label.h"
+#include "../../core/lv_obj.h"
+#include "../../misc/lv_anim.h"
+#include "../label/lv_label.h"
 
 /*********************
  *      DEFINES

src/widgets/btn/lv_btn.c

@@ -10,8 +10,6 @@
 #include "lv_btn.h"
 #if LV_USE_BTN != 0
 
-#include "../extra/layouts/flex/lv_flex.h"
-
 /*********************
  *      DEFINES
  *********************/

src/widgets/btn/lv_btn.h

@@ -13,10 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_BTN != 0
-#include "../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 
 /*********************
  *      DEFINES

src/widgets/btnmatrix/lv_btnmatrix.c

@@ -9,13 +9,13 @@
 #include "lv_btnmatrix.h"
 #if LV_USE_BTNMATRIX != 0
 
-#include "../misc/lv_assert.h"
-#include "../core/lv_indev.h"
-#include "../core/lv_group.h"
-#include "../draw/lv_draw.h"
-#include "../core/lv_refr.h"
-#include "../misc/lv_txt.h"
-#include "../misc/lv_txt_ap.h"
+#include "../../misc/lv_assert.h"
+#include "../../core/lv_indev.h"
+#include "../../core/lv_group.h"
+#include "../../draw/lv_draw.h"
+#include "../../core/lv_refr.h"
+#include "../../misc/lv_txt.h"
+#include "../../misc/lv_txt_ap.h"
 
 /*********************
  *      DEFINES

src/widgets/btnmatrix/lv_btnmatrix.h

@@ -13,11 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_BTNMATRIX != 0
 
-#include "../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 
 /*********************
  *      DEFINES

src/widgets/calendar/lv_calendar.c

@@ -10,7 +10,7 @@
 #include "../../../lvgl.h"
 #if LV_USE_CALENDAR
 
-#include "../../../misc/lv_assert.h"
+#include "../../misc/lv_assert.h"
 
 /*********************
  *      DEFINES

src/widgets/calendar/lv_calendar.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../widgets/lv_btnmatrix.h"
+#include "../btnmatrix/lv_btnmatrix.h"
 
 #if LV_USE_CALENDAR
 
@@ -155,6 +155,9 @@ lv_res_t lv_calendar_get_pressed_date(const lv_obj_t * calendar, lv_calendar_dat
  *      MACROS
  **********************/
 
+#include "lv_calendar_header_arrow.h"
+#include "lv_calendar_header_dropdown.h"
+
 #endif  /*LV_USE_CALENDAR*/
 
 #ifdef __cplusplus

src/widgets/calendar/lv_calendar_header_arrow.c

@@ -10,8 +10,8 @@
 #if LV_USE_CALENDAR_HEADER_ARROW
 
 #include "lv_calendar.h"
-#include "../../../widgets/lv_btn.h"
-#include "../../../widgets/lv_label.h"
+#include "../btn/lv_btn.h"
+#include "../label/lv_label.h"
 #include "../../layouts/flex/lv_flex.h"
 
 /*********************

src/widgets/calendar/lv_calendar_header_arrow.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 #if LV_USE_CALENDAR_HEADER_ARROW
 
 /*********************

src/widgets/calendar/lv_calendar_header_dropdown.c

@@ -10,7 +10,7 @@
 #if LV_USE_CALENDAR_HEADER_DROPDOWN
 
 #include "lv_calendar.h"
-#include "../../../widgets/lv_dropdown.h"
+#include "../dropdown/lv_dropdown.h"
 #include "../../layouts/flex/lv_flex.h"
 
 /*********************

src/widgets/calendar/lv_calendar_header_dropdown.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 #if LV_USE_CALENDAR_HEADER_DROPDOWN
 
 /*********************

src/widgets/canvas/lv_canvas.c

@@ -8,12 +8,12 @@
  *********************/
 #include "lv_canvas.h"
 #if LV_USE_CANVAS != 0
-#include "../misc/lv_assert.h"
-#include "../misc/lv_math.h"
-#include "../draw/lv_draw.h"
-#include "../core/lv_refr.h"
-#include "../core/lv_disp.h"
-#include "../draw/sw/lv_draw_sw.h"
+#include "../../misc/lv_assert.h"
+#include "../../misc/lv_math.h"
+#include "../../draw/lv_draw.h"
+#include "../../core/lv_refr.h"
+#include "../../core/lv_disp.h"
+#include "../../draw/sw/lv_draw_sw.h"
 
 /*********************
  *      DEFINES

src/widgets/canvas/lv_canvas.h

@@ -13,13 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_CANVAS != 0
 
-#include "../core/lv_obj.h"
-#include "../widgets/lv_img.h"
-#include "../draw/lv_draw_img.h"
+#include "../img/lv_img.h"
+#include "../../draw/lv_draw_img.h"
 
 /*********************
  *      DEFINES

src/widgets/chart/lv_chart.c

@@ -9,7 +9,7 @@
 #include "lv_chart.h"
 #if LV_USE_CHART != 0
 
-#include "../../../misc/lv_assert.h"
+#include "../../misc/lv_assert.h"
 
 /*********************
  *      DEFINES

src/widgets/chart/lv_chart.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lvgl.h"
+#include "../../lvgl.h"
 
 #if LV_USE_CHART != 0
 

src/widgets/checkbox/lv_checkbox.c

@@ -9,10 +9,10 @@
 #include "lv_checkbox.h"
 #if LV_USE_CHECKBOX != 0
 
-#include "../misc/lv_assert.h"
-#include "../misc/lv_txt_ap.h"
-#include "../core/lv_group.h"
-#include "../draw/lv_draw.h"
+#include "../../misc/lv_assert.h"
+#include "../../misc/lv_txt_ap.h"
+#include "../../core/lv_group.h"
+#include "../../draw/lv_draw.h"
 
 /*********************
  *      DEFINES

src/widgets/checkbox/lv_checkbox.h

@@ -13,8 +13,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_conf_internal.h"
-#include "../core/lv_obj.h"
+#include "../../lv_conf_internal.h"
+#include "../../core/lv_obj.h"
 
 #if LV_USE_CHECKBOX != 0
 

src/widgets/colorwheel/lv_colorwheel.c

@@ -10,7 +10,7 @@
 #include "lv_colorwheel.h"
 #if LV_USE_COLORWHEEL
 
-#include "../../../misc/lv_assert.h"
+#include "../../misc/lv_assert.h"
 
 /*********************
  *      DEFINES

src/widgets/colorwheel/lv_colorwheel.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lvgl.h"
+#include "../../lvgl.h"
 
 #if LV_USE_COLORWHEEL
 

src/widgets/dropdown/lv_dropdown.c

@@ -6,19 +6,19 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../core/lv_obj.h"
+#include "../../core/lv_obj.h"
 #include "lv_dropdown.h"
 #if LV_USE_DROPDOWN != 0
 
-#include "../misc/lv_assert.h"
-#include "../draw/lv_draw.h"
-#include "../core/lv_group.h"
-#include "../core/lv_indev.h"
-#include "../core/lv_disp.h"
-#include "../font/lv_symbol_def.h"
-#include "../misc/lv_anim.h"
-#include "../misc/lv_math.h"
-#include "../misc/lv_txt_ap.h"
+#include "../../misc/lv_assert.h"
+#include "../../draw/lv_draw.h"
+#include "../../core/lv_group.h"
+#include "../../core/lv_indev.h"
+#include "../../core/lv_disp.h"
+#include "../../font/lv_symbol_def.h"
+#include "../../misc/lv_anim.h"
+#include "../../misc/lv_math.h"
+#include "../../misc/lv_txt_ap.h"
 #include <string.h>
 
 /*********************