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
1c347770
Commit
1c347770
authored
Jan 02, 2018
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
line width bugfox width anti-aliasing
parent
dc3bc9f3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
7 deletions
+8
-7
lv_draw.c
lv_draw/lv_draw.c
+1
-0
lv_theme_alien.c
lv_themes/lv_theme_alien.c
+1
-1
lv_theme_default.c
lv_themes/lv_theme_default.c
+1
-1
lv_theme_night.c
lv_themes/lv_theme_night.c
+2
-2
lv_theme_zen.c
lv_themes/lv_theme_zen.c
+3
-3
No files found.
lv_draw/lv_draw.c
View file @
1c347770
...
@@ -574,6 +574,7 @@ void lv_draw_line(const lv_point_t * p1, const lv_point_t * p2, const lv_area_t
...
@@ -574,6 +574,7 @@ void lv_draw_line(const lv_point_t * p1, const lv_point_t * p2, const lv_area_t
/*Make the correction on lie width*/
/*Make the correction on lie width*/
width
=
((
style
->
line
.
width
-
1
)
*
width_corr_array
[
wcor
])
>>
LINE_WIDTH_CORR_SHIFT
;
width
=
((
style
->
line
.
width
-
1
)
*
width_corr_array
[
wcor
])
>>
LINE_WIDTH_CORR_SHIFT
;
width
=
width
<<
LV_ANTIALIAS
;
width_half
=
width
>>
1
;
width_half
=
width
>>
1
;
width_1
=
width
&
0x1
?
1
:
0
;
width_1
=
width
&
0x1
?
1
:
0
;
...
...
lv_themes/lv_theme_alien.c
View file @
1c347770
...
@@ -371,7 +371,7 @@ static void gauge_init(void)
...
@@ -371,7 +371,7 @@ static void gauge_init(void)
gauge_bg
.
body
.
padding
.
inner
=
LV_DPI
/
8
;
/*Label - scale distance*/
gauge_bg
.
body
.
padding
.
inner
=
LV_DPI
/
8
;
/*Label - scale distance*/
gauge_bg
.
body
.
border
.
color
=
LV_COLOR_HEX3
(
0x777
);
gauge_bg
.
body
.
border
.
color
=
LV_COLOR_HEX3
(
0x777
);
gauge_bg
.
line
.
color
=
lv_color_hsv_to_rgb
(
_hue
,
80
,
75
);
gauge_bg
.
line
.
color
=
lv_color_hsv_to_rgb
(
_hue
,
80
,
75
);
gauge_bg
.
line
.
width
=
3
;
gauge_bg
.
line
.
width
=
2
;
gauge_bg
.
text
.
color
=
lv_color_hsv_to_rgb
(
_hue
,
10
,
90
);
gauge_bg
.
text
.
color
=
lv_color_hsv_to_rgb
(
_hue
,
10
,
90
);
gauge_bg
.
text
.
font
=
_font
;
gauge_bg
.
text
.
font
=
_font
;
...
...
lv_themes/lv_theme_default.c
View file @
1c347770
...
@@ -191,7 +191,7 @@ static void gauge_init(void)
...
@@ -191,7 +191,7 @@ static void gauge_init(void)
static
lv_style_t
gauge
;
static
lv_style_t
gauge
;
lv_style_copy
(
&
gauge
,
&
lmeter
);
lv_style_copy
(
&
gauge
,
&
lmeter
);
gauge
.
line
.
color
=
lmeter
.
body
.
grad_color
;
gauge
.
line
.
color
=
lmeter
.
body
.
grad_color
;
gauge
.
line
.
width
=
3
;
gauge
.
line
.
width
=
2
;
gauge
.
body
.
main_color
=
LV_COLOR_HEX3
(
0x888
);
gauge
.
body
.
main_color
=
LV_COLOR_HEX3
(
0x888
);
gauge
.
body
.
grad_color
=
lmeter
.
body
.
main_color
;
gauge
.
body
.
grad_color
=
lmeter
.
body
.
main_color
;
gauge
.
text
.
color
=
LV_COLOR_HEX3
(
0x888
);
gauge
.
text
.
color
=
LV_COLOR_HEX3
(
0x888
);
...
...
lv_themes/lv_theme_night.c
View file @
1c347770
...
@@ -256,7 +256,7 @@ static void lmeter_init(void)
...
@@ -256,7 +256,7 @@ static void lmeter_init(void)
lmeter_bg
.
body
.
padding
.
inner
=
LV_DPI
/
10
;
/*Text padding*/
lmeter_bg
.
body
.
padding
.
inner
=
LV_DPI
/
10
;
/*Text padding*/
lmeter_bg
.
body
.
border
.
color
=
LV_COLOR_HEX3
(
0x333
);
lmeter_bg
.
body
.
border
.
color
=
LV_COLOR_HEX3
(
0x333
);
lmeter_bg
.
line
.
color
=
LV_COLOR_HEX3
(
0x555
);
lmeter_bg
.
line
.
color
=
LV_COLOR_HEX3
(
0x555
);
lmeter_bg
.
line
.
width
=
2
<<
LV_ANTIALIAS
;
lmeter_bg
.
line
.
width
=
2
;
lmeter_bg
.
text
.
color
=
LV_COLOR_HEX3
(
0xddd
);
lmeter_bg
.
text
.
color
=
LV_COLOR_HEX3
(
0xddd
);
theme
.
lmeter
=
&
lmeter_bg
;
theme
.
lmeter
=
&
lmeter_bg
;
...
@@ -271,7 +271,7 @@ static void gauge_init(void)
...
@@ -271,7 +271,7 @@ static void gauge_init(void)
gauge_bg
.
body
.
main_color
=
lv_color_hsv_to_rgb
(
_hue
,
10
,
70
);
gauge_bg
.
body
.
main_color
=
lv_color_hsv_to_rgb
(
_hue
,
10
,
70
);
gauge_bg
.
body
.
grad_color
=
gauge_bg
.
body
.
main_color
;
gauge_bg
.
body
.
grad_color
=
gauge_bg
.
body
.
main_color
;
gauge_bg
.
line
.
color
=
lv_color_hsv_to_rgb
(
_hue
,
80
,
75
);
gauge_bg
.
line
.
color
=
lv_color_hsv_to_rgb
(
_hue
,
80
,
75
);
gauge_bg
.
line
.
width
=
3
;
gauge_bg
.
line
.
width
=
2
;
gauge_bg
.
text
.
color
=
LV_COLOR_HEX3
(
0xddd
);
gauge_bg
.
text
.
color
=
LV_COLOR_HEX3
(
0xddd
);
theme
.
gauge
=
&
gauge_bg
;
theme
.
gauge
=
&
gauge_bg
;
...
...
lv_themes/lv_theme_zen.c
View file @
1c347770
...
@@ -267,7 +267,7 @@ static void lmeter_init(void)
...
@@ -267,7 +267,7 @@ static void lmeter_init(void)
lv_style_copy
(
&
lmeter
,
&
def
);
lv_style_copy
(
&
lmeter
,
&
def
);
lmeter
.
line
.
color
=
LV_COLOR_HEX3
(
0xddd
);
lmeter
.
line
.
color
=
LV_COLOR_HEX3
(
0xddd
);
lmeter
.
line
.
width
=
3
;
lmeter
.
line
.
width
=
2
;
lmeter
.
body
.
main_color
=
lv_color_hsv_to_rgb
(
_hue
,
80
,
70
);
lmeter
.
body
.
main_color
=
lv_color_hsv_to_rgb
(
_hue
,
80
,
70
);
lmeter
.
body
.
grad_color
=
lmeter
.
body
.
main_color
;
lmeter
.
body
.
grad_color
=
lmeter
.
body
.
main_color
;
lmeter
.
body
.
padding
.
hor
=
LV_DPI
/
8
;
lmeter
.
body
.
padding
.
hor
=
LV_DPI
/
8
;
...
@@ -283,10 +283,10 @@ static void gauge_init(void)
...
@@ -283,10 +283,10 @@ static void gauge_init(void)
lv_style_copy
(
&
gauge
,
&
def
);
lv_style_copy
(
&
gauge
,
&
def
);
gauge
.
line
.
color
=
lv_color_hsv_to_rgb
(
_hue
,
50
,
70
);
gauge
.
line
.
color
=
lv_color_hsv_to_rgb
(
_hue
,
50
,
70
);
gauge
.
line
.
width
=
3
;
gauge
.
line
.
width
=
2
;
gauge
.
body
.
main_color
=
LV_COLOR_HEX3
(
0x999
);
gauge
.
body
.
main_color
=
LV_COLOR_HEX3
(
0x999
);
gauge
.
body
.
grad_color
=
gauge
.
body
.
main_color
;
gauge
.
body
.
grad_color
=
gauge
.
body
.
main_color
;
gauge
.
body
.
padding
.
hor
=
LV_DPI
/
6
;
gauge
.
body
.
padding
.
hor
=
LV_DPI
/
12
;
gauge
.
body
.
border
.
color
=
LV_COLOR_HEX3
(
0x666
);
/*Needle middle color*/
gauge
.
body
.
border
.
color
=
LV_COLOR_HEX3
(
0x666
);
/*Needle middle color*/
theme
.
gauge
=
&
gauge
;
theme
.
gauge
=
&
gauge
;
...
...
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