Merge branch 'master' into dev-5.3

2018-10-20 00:39:12 +02:00
parent 3c5093f3cb e2ddaf7577
commit e0afb3b8b4
7 changed files with 20 additions and 6 deletions
--- a/lv_themes/lv_theme_alien.c
+++ b/lv_themes/lv_theme_alien.c
@@ -136,6 +136,13 @@ static void basic_init(void)

 }

+static void cont_init(void)
+{
+#if USE_LV_CONT != 0
+    theme.cont = &panel;
+#endif
+}
+
 static void btn_init(void)
 {
 #if USE_LV_BTN != 0
@@ -785,6 +792,7 @@ lv_theme_t * lv_theme_alien_init(uint16_t hue, lv_font_t * font)
    }

    basic_init();
+    cont_init();
    btn_init();
    label_init();
    bar_init();