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
7de9b97c
Commit
7de9b97c
authored
Nov 22, 2017
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lv_indev_t element rename
parent
bd60d7cd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
lv_hal_indev.h
lv_hal/lv_hal_indev.h
+1
-1
lv_indev.c
lv_obj/lv_indev.c
+10
-10
No files found.
lv_hal/lv_hal_indev.h
View file @
7de9b97c
...
...
@@ -67,7 +67,7 @@ typedef struct _lv_indev_state_t {
point_t
act_point
;
point_t
last_point
;
point_t
vect
;
point_t
vect_sum
;
point_t
drag_sum
;
/*Count the dragged pixels to check LV_INDEV_DRAG_LIMIT*/
struct
_lv_obj_t
*
act_obj
;
struct
_lv_obj_t
*
last_obj
;
...
...
lv_obj/lv_indev.c
View file @
7de9b97c
...
...
@@ -208,8 +208,8 @@ static void indev_proc_task(void * param)
i
->
state
.
long_pr_sent
=
0
;
i
->
state
.
pr_timestamp
=
0
;
i
->
state
.
longpr_rep_timestamp
=
0
;
i
->
state
.
vect
_sum
.
x
=
0
;
i
->
state
.
vect
_sum
.
y
=
0
;
i
->
state
.
drag
_sum
.
x
=
0
;
i
->
state
.
drag
_sum
.
y
=
0
;
i
->
state
.
reset_query
=
0
;
}
...
...
@@ -261,8 +261,8 @@ static void indev_proc_task(void * param)
i
->
state
.
long_pr_sent
=
0
;
i
->
state
.
pr_timestamp
=
0
;
i
->
state
.
longpr_rep_timestamp
=
0
;
i
->
state
.
vect
_sum
.
x
=
0
;
i
->
state
.
vect
_sum
.
y
=
0
;
i
->
state
.
drag
_sum
.
x
=
0
;
i
->
state
.
drag
_sum
.
y
=
0
;
i
->
state
.
reset_query
=
0
;
}
...
...
@@ -342,8 +342,8 @@ static void indev_proc_press(lv_indev_state_t * state)
state
->
long_pr_sent
=
0
;
state
->
drag_range_out
=
0
;
state
->
drag_in_prog
=
0
;
state
->
vect
_sum
.
x
=
0
;
state
->
vect
_sum
.
y
=
0
;
state
->
drag
_sum
.
x
=
0
;
state
->
drag
_sum
.
y
=
0
;
/*Search for 'top' attribute*/
lv_obj_t
*
i
=
pr_obj
;
...
...
@@ -501,12 +501,12 @@ static void indev_drag(lv_indev_state_t * state)
/*If still there is no drag then count the movement*/
if
(
state
->
drag_range_out
==
0
)
{
state
->
vect
_sum
.
x
+=
state
->
vect
.
x
;
state
->
vect
_sum
.
y
+=
state
->
vect
.
y
;
state
->
drag
_sum
.
x
+=
state
->
vect
.
x
;
state
->
drag
_sum
.
y
+=
state
->
vect
.
y
;
/*If a move is greater then LV_DRAG_LIMIT then begin the drag*/
if
(
MATH_ABS
(
state
->
vect
_sum
.
x
)
>=
LV_INDEV_DRAG_LIMIT
||
MATH_ABS
(
state
->
vect
_sum
.
y
)
>=
LV_INDEV_DRAG_LIMIT
)
if
(
MATH_ABS
(
state
->
drag
_sum
.
x
)
>=
LV_INDEV_DRAG_LIMIT
||
MATH_ABS
(
state
->
drag
_sum
.
y
)
>=
LV_INDEV_DRAG_LIMIT
)
{
state
->
drag_range_out
=
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