BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lvgl
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
lvgl
Commits
4ca6a04c
Commit
4ca6a04c
authored
Nov 19, 2017
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fixes
parent
cc687c8e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
9 deletions
+13
-9
lv_conf_templ.h
lv_conf_templ.h
+6
-6
lv_draw_rbasic.c
lv_draw/lv_draw_rbasic.c
+6
-2
lv_draw_rbasic.h
lv_draw/lv_draw_rbasic.h
+1
-1
No files found.
lv_conf_templ.h
View file @
4ca6a04c
...
...
@@ -68,12 +68,12 @@
/*==================
* THEME USAGE
* ================*/
#define USE_LV_THEME_TEMPL
1
/*Just for test*/
#define USE_LV_THEME_DEFAULT
1
/*Built manly from the built-in styles. Consumes very few RAM*/
#define USE_LV_THEME_ALIEN
1
/*Dark futuristic theme*/
#define USE_LV_THEME_MATERIAL
1
/*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_NIGHT
1
/*Dark elegant theme (Planned)*/
#define USE_LV_THEME_TEMPL
0
/*Just for test*/
#define USE_LV_THEME_DEFAULT
0
/*Built manly from the built-in styles. Consumes very few RAM*/
#define USE_LV_THEME_ALIEN
0
/*Dark futuristic theme*/
#define USE_LV_THEME_MATERIAL
0
/*Flat theme with bold colors and light shadows (Planned)*/
#define USE_LV_THEME_ZEN
0
/*Peaceful, mainly black and white theme (Planned)*/
#define USE_LV_THEME_NIGHT
0
/*Dark elegant theme (Planned)*/
/*==================
* LV OBJ X USAGE
...
...
lv_draw/lv_draw_rbasic.c
View file @
4ca6a04c
...
...
@@ -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)
*/
void
lv_rletter
(
const
point_t
*
pos_p
,
const
area_t
*
mask_p
,
const
font_t
*
font_p
,
uint
8
_t
letter
,
const
font_t
*
font_p
,
uint
32
_t
letter
,
color_t
color
,
opa_t
opa
)
{
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
);
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*/
bitmap_p
++
;
if
(
col_sub
!=
7
)
bitmap_p
++
;
/*Go to the next byte if it not done in the last step*/
}
#else
uint8_t
width_byte
=
w
>>
3
;
/*Width in bytes (e.g. w = 11 -> 2 bytes wide)*/
...
...
lv_draw/lv_draw_rbasic.h
View file @
4ca6a04c
...
...
@@ -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)
*/
void
lv_rletter
(
const
point_t
*
pos_p
,
const
area_t
*
mask_p
,
const
font_t
*
font_p
,
uint
8
_t
letter
,
const
font_t
*
font_p
,
uint
32
_t
letter
,
color_t
color
,
opa_t
opa
);
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment