Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2017-11-19 22:24:57 +01:00
parent cc687c8ead
commit 4ca6a04ce3
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lv_conf_templ.h
View File

@ -68,12 +68,12 @@
/*================== /*==================
* THEME USAGE * THEME USAGE
* ================*/ * ================*/
#define USE_LV_THEME_TEMPL 1 /*Just for test*/ #define USE_LV_THEME_TEMPL 0 /*Just for test*/
#define USE_LV_THEME_DEFAULT 1 /*Built manly from the built-in styles. Consumes very few RAM*/ #define USE_LV_THEME_DEFAULT 0 /*Built manly from the built-in styles. Consumes very few RAM*/
#define USE_LV_THEME_ALIEN 1 /*Dark futuristic theme*/ #define USE_LV_THEME_ALIEN 0 /*Dark futuristic theme*/
#define USE_LV_THEME_MATERIAL 1 /*Flat theme with bold colors and light shadows (Planned)*/ #define USE_LV_THEME_MATERIAL 0 /*Flat theme with bold colors and light shadows (Planned)*/
#define USE_LV_THEME_ZEN 1 /*Peaceful, mainly black and white theme (Planned)*/ #define USE_LV_THEME_ZEN 0 /*Peaceful, mainly black and white theme (Planned)*/
#define USE_LV_THEME_NIGHT 1 /*Dark elegant theme (Planned)*/ #define USE_LV_THEME_NIGHT 0 /*Dark elegant theme (Planned)*/
/*================== /*==================
* LV OBJ X USAGE * LV OBJ X USAGE

8
lv_draw/lv_draw_rbasic.c
View File

@ -90,11 +90,15 @@ void lv_rfill(const area_t * cords_p, const area_t * mask_p,
* @param opa opacity of letter (ignored, only for compatibility with lv_vletter) * @param opa opacity of letter (ignored, only for compatibility with lv_vletter)
*/ */
void lv_rletter(const point_t * pos_p, const area_t * mask_p, void lv_rletter(const point_t * pos_p, const area_t * mask_p,
const font_t * font_p, uint8_t letter, const font_t * font_p, uint32_t letter,
color_t color, opa_t opa) color_t color, opa_t opa)
{ {
uint8_t w = font_get_width(font_p, letter); uint8_t w = font_get_width(font_p, letter);
if(letter == 'C') {
letter = 'C';
}
const uint8_t * bitmap_p = font_get_bitmap(font_p, letter); const uint8_t * bitmap_p = font_get_bitmap(font_p, letter);
uint8_t col, col_sub, row; uint8_t col, col_sub, row;
@ -111,7 +115,7 @@ void lv_rletter(const point_t * pos_p, const area_t * mask_p,
} }
} }
/*Go to the next row*/ /*Go to the next row*/
bitmap_p ++; if(col_sub != 7) bitmap_p ++; /*Go to the next byte if it not done in the last step*/
} }
#else #else
uint8_t width_byte = w >> 3; /*Width in bytes (e.g. w = 11 -> 2 bytes wide)*/ uint8_t width_byte = w >> 3; /*Width in bytes (e.g. w = 11 -> 2 bytes wide)*/

2
lv_draw/lv_draw_rbasic.h
View File

@ -51,7 +51,7 @@ void lv_rfill(const area_t * cords_p, const area_t * mask_p,
* @param opa opacity of letter (ignored, only for compatibility with lv_vletter) * @param opa opacity of letter (ignored, only for compatibility with lv_vletter)
*/ */
void lv_rletter(const point_t * pos_p, const area_t * mask_p, void lv_rletter(const point_t * pos_p, const area_t * mask_p,
const font_t * font_p, uint8_t letter, const font_t * font_p, uint32_t letter,
color_t color, opa_t opa); color_t color, opa_t opa);
/** /**