github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: move opa to body.opa and make border.opa independent from it

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2017-11-02 01:37:32 +01:00
parent 21475e86f2
commit 6e5db9e44e
10 changed files with 272 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lv_obj/lv_obj.c
View File

@@ -18,10 +18,6 @@
#include <stdint.h>
#include <string.h>
#ifdef LV_IMG_DEF_WALLPAPER
#include "../lv_objx/lv_img.h"
#endif
/*********************
* DEFINES
*********************/
@@ -48,10 +44,6 @@ static lv_obj_t * top_layer = NULL;
static lv_obj_t * sys_layer = NULL;
static ll_dsc_t scr_ll; /*Linked list of screens*/
#ifdef LV_IMG_DEF_WALLPAPER
LV_IMG_DECLARE(LV_IMG_DEF_WALLPAPER);
#endif
/**********************
* MACROS
**********************/
@@ -78,15 +70,8 @@ void lv_init(void)
/*Create the default screen*/
ll_init(&scr_ll, sizeof(lv_obj_t));
#ifdef LV_IMG_DEF_WALLPAPER
lv_img_create_file("def_wp", LV_IMG_DEF_WALLPAPER);
def_scr = lv_img_create(NULL, NULL);
lv_img_set_auto_size(def_scr, false);
lv_img_set_file(def_scr, "U:/def_wp");
lv_img_set_upscale(def_scr, true);
#else
def_scr = lv_obj_create(NULL, NULL);
#endif
act_scr = def_scr;
top_layer = lv_obj_create(NULL, NULL);