fix(config): Keep the sequence of widget in order (#3314)

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2022-05-05 03:00:49 +08:00
committed by GitHub
parent da9e53c2f4
commit e827207080
3 changed files with 49 additions and 49 deletions

14
Kconfig
View File

@@ -831,6 +831,13 @@ menu "LVGL configuration"
config LV_USE_MSGBOX config LV_USE_MSGBOX
bool "Msgbox." bool "Msgbox."
default y if !LV_CONF_MINIMAL default y if !LV_CONF_MINIMAL
config LV_USE_SPAN
bool "span"
default y if !LV_CONF_MINIMAL
config LV_SPAN_SNIPPET_STACK_SIZE
int "Maximum number of span descriptor"
default 64
depends on LV_USE_SPAN
config LV_USE_SPINBOX config LV_USE_SPINBOX
bool "Spinbox." bool "Spinbox."
default y if !LV_CONF_MINIMAL default y if !LV_CONF_MINIMAL
@@ -846,13 +853,6 @@ menu "LVGL configuration"
config LV_USE_WIN config LV_USE_WIN
bool "Win" bool "Win"
default y if !LV_CONF_MINIMAL default y if !LV_CONF_MINIMAL
config LV_USE_SPAN
bool "span"
default y if !LV_CONF_MINIMAL
config LV_SPAN_SNIPPET_STACK_SIZE
int "Maximum number of span descriptor"
default 64
depends on LV_USE_SPAN
endmenu endmenu
menu "Themes" menu "Themes"

View File

@@ -461,8 +461,6 @@
#define LV_USE_ARC 1 #define LV_USE_ARC 1
#define LV_USE_ANIMIMG 1
#define LV_USE_BAR 1 #define LV_USE_BAR 1
#define LV_USE_BTN 1 #define LV_USE_BTN 1
@@ -508,6 +506,8 @@
/*----------- /*-----------
* Widgets * Widgets
*----------*/ *----------*/
#define LV_USE_ANIMIMG 1
#define LV_USE_CALENDAR 1 #define LV_USE_CALENDAR 1
#if LV_USE_CALENDAR #if LV_USE_CALENDAR
#define LV_CALENDAR_WEEK_STARTS_MONDAY 0 #define LV_CALENDAR_WEEK_STARTS_MONDAY 0
@@ -540,6 +540,12 @@
#define LV_USE_MSGBOX 1 #define LV_USE_MSGBOX 1
#define LV_USE_SPAN 1
#if LV_USE_SPAN
/*A line text can contain maximum num of span descriptor */
#define LV_SPAN_SNIPPET_STACK_SIZE 64
#endif
#define LV_USE_SPINBOX 1 #define LV_USE_SPINBOX 1
#define LV_USE_SPINNER 1 #define LV_USE_SPINNER 1
@@ -550,12 +556,6 @@
#define LV_USE_WIN 1 #define LV_USE_WIN 1
#define LV_USE_SPAN 1
#if LV_USE_SPAN
/*A line text can contain maximum num of span descriptor */
#define LV_SPAN_SNIPPET_STACK_SIZE 64
#endif
/*----------- /*-----------
* Themes * Themes
*----------*/ *----------*/

View File

@@ -1345,18 +1345,6 @@
#endif #endif
#endif #endif
#ifndef LV_USE_ANIMIMG
#ifdef _LV_KCONFIG_PRESENT
#ifdef CONFIG_LV_USE_ANIMIMG
#define LV_USE_ANIMIMG CONFIG_LV_USE_ANIMIMG
#else
#define LV_USE_ANIMIMG 0
#endif
#else
#define LV_USE_ANIMIMG 1
#endif
#endif
#ifndef LV_USE_BAR #ifndef LV_USE_BAR
#ifdef _LV_KCONFIG_PRESENT #ifdef _LV_KCONFIG_PRESENT
#ifdef CONFIG_LV_USE_BAR #ifdef CONFIG_LV_USE_BAR
@@ -1574,6 +1562,18 @@
/*----------- /*-----------
* Widgets * Widgets
*----------*/ *----------*/
#ifndef LV_USE_ANIMIMG
#ifdef _LV_KCONFIG_PRESENT
#ifdef CONFIG_LV_USE_ANIMIMG
#define LV_USE_ANIMIMG CONFIG_LV_USE_ANIMIMG
#else
#define LV_USE_ANIMIMG 0
#endif
#else
#define LV_USE_ANIMIMG 1
#endif
#endif
#ifndef LV_USE_CALENDAR #ifndef LV_USE_CALENDAR
#ifdef _LV_KCONFIG_PRESENT #ifdef _LV_KCONFIG_PRESENT
#ifdef CONFIG_LV_USE_CALENDAR #ifdef CONFIG_LV_USE_CALENDAR
@@ -1750,6 +1750,28 @@
#endif #endif
#endif #endif
#ifndef LV_USE_SPAN
#ifdef _LV_KCONFIG_PRESENT
#ifdef CONFIG_LV_USE_SPAN
#define LV_USE_SPAN CONFIG_LV_USE_SPAN
#else
#define LV_USE_SPAN 0
#endif
#else
#define LV_USE_SPAN 1
#endif
#endif
#if LV_USE_SPAN
/*A line text can contain maximum num of span descriptor */
#ifndef LV_SPAN_SNIPPET_STACK_SIZE
#ifdef CONFIG_LV_SPAN_SNIPPET_STACK_SIZE
#define LV_SPAN_SNIPPET_STACK_SIZE CONFIG_LV_SPAN_SNIPPET_STACK_SIZE
#else
#define LV_SPAN_SNIPPET_STACK_SIZE 64
#endif
#endif
#endif
#ifndef LV_USE_SPINBOX #ifndef LV_USE_SPINBOX
#ifdef _LV_KCONFIG_PRESENT #ifdef _LV_KCONFIG_PRESENT
#ifdef CONFIG_LV_USE_SPINBOX #ifdef CONFIG_LV_USE_SPINBOX
@@ -1810,28 +1832,6 @@
#endif #endif
#endif #endif
#ifndef LV_USE_SPAN
#ifdef _LV_KCONFIG_PRESENT
#ifdef CONFIG_LV_USE_SPAN
#define LV_USE_SPAN CONFIG_LV_USE_SPAN
#else
#define LV_USE_SPAN 0
#endif
#else
#define LV_USE_SPAN 1
#endif
#endif
#if LV_USE_SPAN
/*A line text can contain maximum num of span descriptor */
#ifndef LV_SPAN_SNIPPET_STACK_SIZE
#ifdef CONFIG_LV_SPAN_SNIPPET_STACK_SIZE
#define LV_SPAN_SNIPPET_STACK_SIZE CONFIG_LV_SPAN_SNIPPET_STACK_SIZE
#else
#define LV_SPAN_SNIPPET_STACK_SIZE 64
#endif
#endif
#endif
/*----------- /*-----------
* Themes * Themes
*----------*/ *----------*/