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
5654c97c
Commit
5654c97c
authored
Dec 20, 2017
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor bugfixes
parent
d9590baf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
lv_refr.c
lv_core/lv_refr.c
+0
-1
lv_btnm.c
lv_objx/lv_btnm.c
+7
-0
lvgl.h
lvgl.h
+3
-3
No files found.
lv_core/lv_refr.c
View file @
5654c97c
...
...
@@ -260,7 +260,6 @@ static void lv_refr_area_with_vdb(const lv_area_t * area_p)
/*Calculate the max row num*/
lv_coord_t
w
=
lv_area_get_width
(
area_p
);
lv_coord_t
h
=
lv_area_get_height
(
area_p
);
lv_coord_t
x2
;
lv_coord_t
y2
=
area_p
->
y2
>=
LV_VER_RES
?
y2
=
LV_VER_RES
-
1
:
area_p
->
y2
;
uint32_t
max_row
=
(
uint32_t
)
LV_VDB_SIZE
/
(
w
<<
LV_AA
);
...
...
lv_objx/lv_btnm.c
View file @
5654c97c
...
...
@@ -223,6 +223,13 @@ void lv_btnm_set_map(lv_obj_t * btnm, const char ** map)
}
}
act_y
+=
btn_h
+
style_bg
->
body
.
padding
.
inner
;
/*If no vertical padding then make sure the last row is at the bottom of 'btnm'*/
if
(
style_bg
->
body
.
padding
.
ver
==
0
&&
act_y
+
btn_h
*
2
>
max_h
)
{
/*Last row?*/
btn_h
=
max_h
-
act_y
;
}
if
(
strlen
(
map_p_tmp
[
btn_cnt
])
==
0
)
break
;
/*Break on end of map*/
map_p_tmp
=
&
map_p_tmp
[
btn_cnt
+
1
];
/*Set the map to the next line*/
i_tot
++
;
/*Skip the '\n'*/
...
...
lvgl.h
View file @
5654c97c
...
...
@@ -54,9 +54,9 @@ extern "C" {
* DEFINES
*********************/
/*Current version of LittlevGL*/
#define LVGL_VERSION_MAJOR 5
#define LVGL_VERSION_MINOR 0
#define LVGL_VERSION_PATH 0
#define LVGL_VERSION_MAJOR
5
#define LVGL_VERSION_MINOR
0
#define LVGL_VERSION_PAT
C
H 0
#define LVGL_VERSION_INFO "rc-1"
/**********************
...
...
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