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
6591da59
Commit
6591da59
authored
May 03, 2017
by
Gabor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor bugfixes
parent
e50be12e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
lv_app.c
lv_app/lv_app.c
+1
-3
lv_app_sysmon.c
lv_appx/lv_app_sysmon.c
+2
-3
lv_conf_temp.h
lv_conf_temp.h
+4
-1
lv_draw_rbasic.c
lv_draw/lv_draw_rbasic.c
+1
-1
lv_page.c
lv_objx/lv_page.c
+1
-1
No files found.
lv_app/lv_app.c
View file @
6591da59
...
...
@@ -533,8 +533,6 @@ static void lv_app_init_desktop(void)
lv_cont_set_layout
(
lv_page_get_scrl
(
sc_page
),
LV_CONT_LAYOUT_GRID
);
lv_page_set_rel_action
(
sc_page
,
lv_app_sc_page_rel_action
);
lv_page_set_sb_mode
(
sc_page
,
LV_PAGE_SB_MODE_AUTO
);
}
#endif
...
...
@@ -562,7 +560,7 @@ static lv_action_res_t lv_app_menu_rel_action(lv_obj_t * app_btn, lv_dispi_t * d
app_list
=
lv_list_create
(
lv_scr_act
(),
NULL
);
lv_obj_t
*
scrl
=
lv_page_get_scrl
(
app_list
);
lv_obj_set_style
(
scrl
,
&
app_style
.
menu
);
lv_obj_set_size
(
app_list
,
LV_HOR_RES
/
3
,
(
LV_VER_RES
*
3
)
/
4
);
lv_obj_set_size
(
app_list
,
LV_HOR_RES
/
2
,
(
LV_VER_RES
*
3
)
/
4
);
lv_obj_align
(
app_list
,
menuh
,
LV_ALIGN_OUT_BOTTOM_LEFT
,
0
,
0
);
lv_list_set_styles_btn
(
app_list
,
&
app_style
.
menu_btn_rel
,
&
app_style
.
menu_btn_pr
,
NULL
,
NULL
,
NULL
);
...
...
lv_appx/lv_app_sysmon.c
View file @
6591da59
...
...
@@ -363,8 +363,8 @@ static void lv_app_sysmon_refr(void)
MEM_LABEL_COLOR
,
mem_pct
[
LV_APP_SYSMON_PNUM
-
1
],
TXT_RECOLOR_CMD
,
mem_mon
.
size_total
,
mem_mon
.
size_total
-
mem_mon
.
size_free
,
mem_mon
.
size_free
,
mem_mon
.
pct_frag
);
(
int
)
mem_mon
.
size_total
,
(
int
)
mem_mon
.
size_total
-
mem_mon
.
size_free
,
mem_mon
.
size_free
,
mem_mon
.
pct_frag
);
sprintf
(
buf_short
,
"%sMem: %d %%
\n
Frag: %d %%
\n
"
,
buf_short
,
mem_pct
[
LV_APP_SYSMON_PNUM
-
1
],
mem_mon
.
pct_frag
);
...
...
@@ -380,7 +380,6 @@ static void lv_app_sysmon_refr(void)
if
(
win_data
!=
NULL
)
{
lv_label_set_text
(
win_data
->
label
,
buf_long
);
lv_chart_set_next
(
win_data
->
chart
,
win_data
->
mem_dl
,
mem_pct
[
LV_APP_SYSMON_PNUM
-
1
]);
lv_chart_set_next
(
win_data
->
chart
,
win_data
->
cpu_dl
,
cpu_pct
[
LV_APP_SYSMON_PNUM
-
1
]);
...
...
lv_conf_temp.h
View file @
6591da59
...
...
@@ -42,7 +42,7 @@
*=================*/
/*Display Input settings*/
#define LV_DISPI_READ_PERIOD 50 /*Input device read period milliseconds*/
#define LV_DISPI_TP_MARKER 0 /*Mark the pressed points*/
#define LV_DISPI_TP_MARKER 0 /*Mark the pressed points
(Value means marker point size)
*/
#define LV_DISPI_DRAG_LIMIT 10 /*Drag threshold in pixels */
#define LV_DISPI_DRAG_THROW 20 /*Drag throw slow-down in [%]. Greater value means faster slow-down */
#define LV_DISPI_LONG_PRESS_TIME 400 /*Long press time in milliseconds*/
...
...
@@ -161,6 +161,9 @@
#define LV_APP_ENABLE 1
#if LV_APP_ENABLE != 0
#define LV_APP_DESKTOP 1
#define LV_APP_SC_WIDTH (LV_HOR_RES / 4) /*Shortcut width*/
#define LV_APP_SC_HEIGHT (LV_VER_RES / 3) /*Shortcut height*/
#define LV_APP_FONT_SMALL FONT_DEJAVU_20
...
...
lv_draw/lv_draw_rbasic.c
View file @
6591da59
...
...
@@ -148,7 +148,7 @@ void lv_rletter(const point_t * pos_p, const area_t * mask_p,
if
(
px_cnt
!=
0
)
{
lv_rpx
(
pos_p
->
x
+
col
,
pos_p
->
y
+
row
,
mask_p
,
color_mix
(
color
,
COLOR_SILVER
,
63
*
px_cnt
));
lv_rpx
(
pos_p
->
x
+
col
,
pos_p
->
y
+
row
,
mask_p
,
color_mix
(
color
,
COLOR_SILVER
,
63
*
px_cnt
)
,
OPA_COVER
);
}
}
...
...
lv_objx/lv_page.c
View file @
6591da59
...
...
@@ -460,7 +460,7 @@ void lv_page_focus(lv_obj_t * page, lv_obj_t * obj, uint16_t anim_time)
a
.
act_time
=
0
;
a
.
start
=
lv_obj_get_y
(
ext
->
scrl
);
a
.
end
=
scrlable_y
;
a
.
time
=
LV_PAGE_ANIM_FOCUS_TIME
;
//anim_speed_to_time(LV_PAGE_ANIM_SPEED, a.start, a.end)
;
a
.
time
=
anim_time
;
a
.
end_cb
=
NULL
;
a
.
playback
=
0
;
a
.
repeat
=
0
;
...
...
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