Browse Source

Merge pull request #1106 from BernardXiong/master

[GUI Engine] fix TRANSPARENT issue
Bernard Xiong 7 years ago
parent
commit
c77cebc4c0
2 changed files with 9 additions and 9 deletions
  1. 8 8
      components/gui/Kconfig
  2. 1 1
      components/gui/include/rtgui/color.h

+ 8 - 8
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

+ 1 - 1
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;