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

dejavu 10 and 8 added but not corrected

Browse Source
This commit is contained in:
Kiss-Vamosi Gabor
2016-12-15 19:47:27 +01:00
parent 8d70829493
commit c1e4acc661
7 changed files with 5168 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lv_misc/font.c
View File

@@ -8,6 +8,7 @@
*********************/ *********************/
#include <stddef.h> #include <stddef.h>
#include "font.h" #include "font.h"
#include "fonts/dejavu_10.h"
#include "fonts/dejavu_14.h" #include "fonts/dejavu_14.h"
#include "fonts/dejavu_20.h" #include "fonts/dejavu_20.h"
#include "fonts/dejavu_30.h" #include "fonts/dejavu_30.h"
@@ -54,6 +55,16 @@ const font_t * font_get(font_types_t font_id)
switch(font_id) switch(font_id)
{ {
#if USE_FONT_DEJAVU_8 != 0
case FONT_DEJAVU_8:
font_p = dejavu_8_get_dsc();
break;
#endif
#if USE_FONT_DEJAVU_10 != 0
case FONT_DEJAVU_10:
font_p = dejavu_10_get_dsc();
break;
#endif
#if USE_FONT_DEJAVU_14 != 0 #if USE_FONT_DEJAVU_14 != 0
case FONT_DEJAVU_14: case FONT_DEJAVU_14:
font_p = dejavu_14_get_dsc(); font_p = dejavu_14_get_dsc();

6
lv_misc/font.h
View File

@@ -22,6 +22,12 @@
typedef enum typedef enum
{ {
#if USE_FONT_DEJAVU_8
FONT_DEJAVU_8,
#endif
#if USE_FONT_DEJAVU_10
FONT_DEJAVU_10,
#endif
#if USE_FONT_DEJAVU_14 #if USE_FONT_DEJAVU_14
FONT_DEJAVU_14, FONT_DEJAVU_14,
#endif #endif

2780
lv_misc/fonts/dejavu_10.c Normal file
View File

File diff suppressed because it is too large Load Diff

18
lv_misc/fonts/dejavu_10.h Normal file
View File

@@ -0,0 +1,18 @@
#ifndef DEJAVU_10_H
#define DEJAVU_10_H
/*Use ISO8859-1 encoding in the IDE*/
#include "lv_conf.h"
#if USE_FONT_DEJAVU_10 != 0
#include <stdint.h>
#include "../font.h"
const font_t * dejavu_10_get_dsc(void);
#endif
#endif

2332
lv_misc/fonts/dejavu_8.c Normal file
View File

File diff suppressed because it is too large Load Diff

18
lv_misc/fonts/dejavu_8.h Normal file
View File

@@ -0,0 +1,18 @@
#ifndef DEJAVU_8_H
#define DEJAVU_8_H
/*Use ISO8859-1 encoding in the IDE*/
#include "lv_conf.h"
#if USE_FONT_DEJAVU_8 != 0
#include <stdint.h>
#include "../font.h"
const font_t * dejavu_8_get_dsc(void);
#endif
#endif

4
lv_objx/lv_img.c
View File

@@ -219,6 +219,8 @@ void lv_img_set_file(lv_obj_t * img, const char * fn)
if(lv_img_get_auto_size(img) != false) { if(lv_img_get_auto_size(img) != false) {
lv_obj_set_size(img, ext->w, ext->h); lv_obj_set_size(img, ext->w, ext->h);
} }
lv_obj_inv(img);
} }
/** /**
@@ -308,7 +310,7 @@ static void lv_imgs_init(void)
/*Dark style*/ /*Dark style*/
memcpy(&lv_imgs_dark, &lv_imgs_def, sizeof(lv_imgs_t)); memcpy(&lv_imgs_dark, &lv_imgs_def, sizeof(lv_imgs_t));
lv_imgs_dark.objs.color = COLOR_WHITE; lv_imgs_dark.recolor_opa = OPA_50; lv_imgs_dark.objs.color = COLOR_BLACK; lv_imgs_dark.recolor_opa = OPA_50;
/*Light style*/ /*Light style*/
memcpy(&lv_imgs_light, &lv_imgs_dark, sizeof(lv_imgs_t)); memcpy(&lv_imgs_light, &lv_imgs_dark, sizeof(lv_imgs_t));