lv_obj folder rename to lv_core

2017-11-30 11:35:33 +01:00
parent 2f5a09bc99
commit 514d2b38b4
54 changed files with 77 additions and 80 deletions
--- a/lv_objx/lv_bar.h
+++ b/lv_objx/lv_bar.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_BAR != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_cont.h"
 #include "lv_btn.h"
 #include "lv_label.h"
--- a/lv_objx/lv_btn.c
+++ b/lv_objx/lv_btn.c
@@ -12,7 +12,7 @@

 #include <string.h>
 #include "lv_btn.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_area.h"
--- a/lv_objx/lv_btn.h
+++ b/lv_objx/lv_btn.h
@@ -22,7 +22,7 @@ extern "C" {
 #endif

 #include "lv_cont.h"
-#include "../lv_obj/lv_indev.h"
+#include "../lv_core/lv_indev.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@@ -10,9 +10,9 @@
 #if USE_LV_BTNM != 0

 #include "lv_btnm.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
-#include "../lv_obj/lv_refr.h"
+#include "../lv_core/lv_refr.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_txt.h"

--- a/lv_objx/lv_btnm.h
+++ b/lv_objx/lv_btnm.h
@@ -17,7 +17,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_BTNM != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_label.h"
 #include "lv_btn.h"

--- a/lv_objx/lv_cb.c
+++ b/lv_objx/lv_cb.c
@@ -10,7 +10,7 @@
 #if USE_LV_CB != 0

 #include "lv_cb.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"

 /*********************
@@ -247,7 +247,7 @@ static bool lv_bullet_design(lv_obj_t * bullet, const lv_area_t * mask, lv_desig
    if(mode == LV_DESIGN_COVER_CHK) {
        return ancestor_bullet_design(bullet, mask, mode);
    } else if(mode == LV_DESIGN_DRAW_MAIN) {
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
        /* If the check box is the active in a group and
         * the background is not visible (transparent or empty)
         * then activate the style of the bullet*/
@@ -265,7 +265,7 @@ static bool lv_bullet_design(lv_obj_t * bullet, const lv_area_t * mask, lv_desig
 #endif
        ancestor_bullet_design(bullet, mask, mode);

-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
        bullet->style_p = style_ori;  /*Revert the style*/
 #endif
    } else if(mode == LV_DESIGN_DRAW_POST) {
--- a/lv_objx/lv_cb.h
+++ b/lv_objx/lv_cb.h
@@ -25,7 +25,7 @@ extern "C" {
 #error "lv_cb: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL  1) "
 #endif

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_btn.h"
 #include "lv_label.h"

--- a/lv_objx/lv_chart.h
+++ b/lv_objx/lv_chart.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_CHART != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_line.h"

 /*********************
--- a/lv_objx/lv_cont.h
+++ b/lv_objx/lv_cont.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_CONT != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -12,8 +12,8 @@

 #include "lv_ddlist.h"
 #include "../lv_draw/lv_draw.h"
-#include "../lv_obj/lv_group.h"
-#include "../lv_obj/lv_indev.h"
+#include "../lv_core/lv_group.h"
+#include "../lv_core/lv_indev.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_fonts/symbol_def.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_ddlist.h
+++ b/lv_objx/lv_ddlist.h
@@ -25,7 +25,7 @@ extern "C" {
 #error "lv_ddlist: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL  1) "
 #endif

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "../lv_objx/lv_page.h"
 #include "../lv_objx/lv_label.h"

--- a/lv_objx/lv_gauge.h
+++ b/lv_objx/lv_gauge.h
@@ -21,7 +21,7 @@ extern "C" {
 #error "lv_gauge: lv_lmeter is required. Enable it in lv_conf.h (USE_LV_LMETER  1) "
 #endif

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_lmeter.h"
 #include "lv_label.h"
 #include "lv_line.h"
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_IMG != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_fs.h"
 #include "../lv_misc/lv_fonts/symbol_def.h"
 #include "lv_label.h"
--- a/lv_objx/lv_kb.h
+++ b/lv_objx/lv_kb.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_KB != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_btnm.h"

 /*********************
--- a/lv_objx/lv_label.c
+++ b/lv_objx/lv_label.c
@@ -10,8 +10,8 @@
 #if USE_LV_LABEL != 0

 #include "lv_label.h"
-#include "../lv_obj/lv_obj.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_obj.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_misc/lv_color.h"
 #include "../lv_misc/lv_math.h"
@@ -629,7 +629,7 @@ static bool lv_label_design(lv_obj_t * label, const lv_area_t * mask, lv_design_
        lv_style_t * style = lv_obj_get_style(label);
        lv_obj_get_coords(label, &cords);

-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
        lv_group_t * g = lv_obj_get_group(label);
        if(lv_group_get_focused(g) == label) {
            lv_draw_rect(&cords, mask, style);
--- a/lv_objx/lv_label.h
+++ b/lv_objx/lv_label.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_LABEL != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_font.h"
 #include "../lv_misc/lv_txt.h"
 #include "../lv_misc/lv_fonts/symbol_def.h"
--- a/lv_objx/lv_led.h
+++ b/lv_objx/lv_led.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_LED != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_line.h
+++ b/lv_objx/lv_line.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_LINE != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_list.c
+++ b/lv_objx/lv_list.c
@@ -10,7 +10,7 @@
 #if USE_LV_LIST != 0

 #include "lv_list.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
 #include "../lv_misc/lv_math.h"
--- a/lv_objx/lv_list.h
+++ b/lv_objx/lv_list.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif


-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_page.h"
 #include "lv_btn.h"
 #include "lv_label.h"
--- a/lv_objx/lv_lmeter.c
+++ b/lv_objx/lv_lmeter.c
@@ -12,7 +12,7 @@
 #include "lv_lmeter.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_misc/lv_trigo.h"

 /*********************
@@ -242,7 +242,7 @@ static bool lv_lmeter_design(lv_obj_t * lmeter, const lv_area_t * mask, lv_desig
        memcpy(&style_tmp, style, sizeof(lv_style_t));


-#if LV_OBJ_GROUP
+#if LV_GROUP
        lv_group_t *g = lv_obj_get_group(lmeter);
        if(lv_group_get_focused(g) == lmeter) {
            style_tmp.line.width += 1 << LV_ANTIALIAS;
--- a/lv_objx/lv_lmeter.h
+++ b/lv_objx/lv_lmeter.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_LMETER != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_mbox.c
+++ b/lv_objx/lv_mbox.c
@@ -11,7 +11,7 @@
 #if USE_LV_MBOX != 0

 #include "lv_mbox.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
 #include "../lv_misc/lv_math.h"
--- a/lv_objx/lv_mbox.h
+++ b/lv_objx/lv_mbox.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif


-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_cont.h"
 #include "lv_btnm.h"
 #include "lv_label.h"
--- a/lv_objx/lv_objx_templ.h
+++ b/lv_objx/lv_objx_templ.h
@@ -24,7 +24,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_TEMPL != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_page.c
+++ b/lv_objx/lv_page.c
@@ -9,11 +9,11 @@
 #include "../../lv_conf.h"
 #if USE_LV_PAGE != 0

-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_objx/lv_page.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "../lv_obj/lv_refr.h"
+#include "../lv_core/lv_refr.h"
 #include "../lv_misc/lv_anim.h"
 #include "../lv_misc/lv_math.h"

@@ -389,7 +389,7 @@ static bool lv_scrl_design(lv_obj_t * scrl, const lv_area_t * mask, lv_design_mo
    if(mode == LV_DESIGN_COVER_CHK) {
        return ancestor_design(scrl, mask, mode);
    } else if(mode == LV_DESIGN_DRAW_MAIN) {
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
        /* If the page is the active in a group and
         * the background (page) is not visible (transparent or empty)
         * then activate the style of the scrollable*/
@@ -407,7 +407,7 @@ static bool lv_scrl_design(lv_obj_t * scrl, const lv_area_t * mask, lv_design_mo
 #endif
        ancestor_design(scrl, mask, mode);

-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
        scrl->style_p = style_ori;  /*Revert the style*/
 #endif
    } else if(mode == LV_DESIGN_DRAW_POST) {
--- a/lv_objx/lv_page.h
+++ b/lv_objx/lv_page.h
@@ -22,7 +22,7 @@ extern "C" {
 #endif

 #include "lv_cont.h"
-#include "../lv_obj/lv_indev.h"
+#include "../lv_core/lv_indev.h"

 /*********************
 *      DEFINES
--- a/lv_objx/lv_roller.c
+++ b/lv_objx/lv_roller.c
@@ -11,7 +11,7 @@

 #include "lv_roller.h"
 #include "../lv_draw/lv_draw.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"

 /*********************
--- a/lv_objx/lv_roller.h
+++ b/lv_objx/lv_roller.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_ROLLER != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_ddlist.h"

 /*********************
--- a/lv_objx/lv_slider.c
+++ b/lv_objx/lv_slider.c
@@ -10,7 +10,7 @@
 #if USE_LV_SLIDER != 0

 #include "lv_slider.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_math.h"
--- a/lv_objx/lv_slider.h
+++ b/lv_objx/lv_slider.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_SLIDER != 0

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_bar.h"

 /*********************
--- a/lv_objx/lv_sw.h
+++ b/lv_objx/lv_sw.h
@@ -21,7 +21,7 @@ extern "C" {
 #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (USE_LV_SLIDER  1)"
 #endif

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_slider.h"

 /*********************
--- a/lv_objx/lv_ta.c
+++ b/lv_objx/lv_ta.c
@@ -11,7 +11,7 @@
 #if USE_LV_TA != 0

 #include "lv_ta.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
--- a/lv_objx/lv_ta.h
+++ b/lv_objx/lv_ta.h
@@ -25,7 +25,7 @@ extern "C" {
 #error "lv_ta: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL  1) "
 #endif

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_page.h"
 #include "lv_label.h"

--- a/lv_objx/lv_tabview.h
+++ b/lv_objx/lv_tabview.h
@@ -26,7 +26,7 @@ extern "C" {
 #error "lv_tabview: lv_page is required. Enable it in lv_conf.h (USE_LV_PAGE  1) "
 #endif

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "../lv_objx/lv_win.h"
 #include "../lv_objx/lv_page.h"

--- a/lv_objx/lv_win.h
+++ b/lv_objx/lv_win.h
@@ -34,7 +34,7 @@ extern "C" {
 #error "lv_win: lv_page is required. Enable it in lv_conf.h (USE_LV_PAGE  1) "
 #endif

-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_cont.h"
 #include "lv_btn.h"
 #include "lv_label.h"