summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2017-12-14 13:10:38 +0800
committerBernard Xiong <[email protected]>2017-12-14 13:10:38 +0800
commitb95be05c055faf5a368849eb7781b9328daf2a91 (patch)
tree987b06aa6a44b60fb1da985757acd47fbce09a58 /components
parentc4b6fa797890add7fe41be72f869e9ff2a0e3a76 (diff)
[GUI Engine] fix TRANSPARENT issue
Diffstat (limited to 'components')
-rw-r--r--components/gui/Kconfig16
-rw-r--r--components/gui/include/rtgui/color.h2
2 files changed, 9 insertions, 9 deletions
diff --git a/components/gui/Kconfig b/components/gui/Kconfig
index 545b08743e..0c907f397e 100644
--- a/components/gui/Kconfig
+++ b/components/gui/Kconfig
@@ -47,13 +47,13 @@ choice
default RTGUI_IMAGE_JPEG_NONE
config RTGUI_IMAGE_JPEG_NONE
- bool "No PNG image format"
+ bool "No"
config RTGUI_IMAGE_JPEG
- bool "Use libjpeg"
+ bool "with libjpeg"
config RTGUI_IMAGE_TJPGD
- bool "Use TJPGD"
+ bool "with TJpgDec(Tiny JPEG Decompressor)"
endchoice
choice
@@ -61,13 +61,13 @@ choice
default RTGUI_IMAGE_LODEPNG
config RTGUI_IMAGE_PNG_NONE
- bool "No PNG image format"
+ bool "No"
config RTGUI_IMAGE_PNG
- bool "Use libpng"
+ bool "with libpng"
config RTGUI_IMAGE_LODEPNG
- bool "Use lodepng"
+ bool "with LodePNG"
endchoice
config RTGUI_IMAGE_BMP
@@ -76,10 +76,10 @@ config RTGUI_IMAGE_BMP
config RTGUI_IMAGE_CONTAINER
bool "Use image container"
- default n
+ default y
config RTGUI_USING_DEMO
- bool "Display an example of GUI"
+ bool "Enable the example of UI Engine"
default n
endif
diff --git a/components/gui/include/rtgui/color.h b/components/gui/include/rtgui/color.h
index f3c232e241..c9b8282425 100644
--- a/components/gui/include/rtgui/color.h
+++ b/components/gui/include/rtgui/color.h
@@ -72,8 +72,8 @@ extern const rtgui_color_t default_background;
#ifdef TRANSPARENT
#undef TRANSPARENT
-#define TRANSPARENT RTGUI_ARGB(0, 0, 0, 0)
#endif
+#define TRANSPARENT RTGUI_ARGB(0, 0, 0, 0)
extern const rtgui_color_t red;
extern const rtgui_color_t green;