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
e7055bed
Commit
e7055bed
authored
Dec 11, 2017
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slider: lv_slider_is_dragged added
parent
dffc613d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
24 deletions
+34
-24
lv_slider.c
lv_objx/lv_slider.c
+30
-17
lv_slider.h
lv_objx/lv_slider.h
+4
-7
No files found.
lv_objx/lv_slider.c
View file @
e7055bed
...
@@ -157,6 +157,19 @@ void lv_slider_set_style(lv_obj_t *slider, lv_slider_style_t type, lv_style_t *s
...
@@ -157,6 +157,19 @@ void lv_slider_set_style(lv_obj_t *slider, lv_slider_style_t type, lv_style_t *s
*====================*/
*====================*/
/**
/**
* Get the value of a slider
* @param slider pointer to a slider object
* @return the value of the slider
*/
int16_t
lv_slider_get_value
(
lv_obj_t
*
slider
)
{
lv_slider_ext_t
*
ext
=
lv_obj_get_ext_attr
(
slider
);
if
(
ext
->
drag_value
!=
LV_SLIDER_NOT_PRESSED
)
return
ext
->
drag_value
;
else
return
lv_bar_get_value
(
slider
);
}
/**
* Get the slider action function
* Get the slider action function
* @param slider pointer to slider object
* @param slider pointer to slider object
* @return the callback function
* @return the callback function
...
@@ -168,15 +181,14 @@ lv_action_t lv_slider_get_action(lv_obj_t * slider)
...
@@ -168,15 +181,14 @@ lv_action_t lv_slider_get_action(lv_obj_t * slider)
}
}
/**
/**
*
Set the styles of a slider
*
Give the slider is being dragged or not
* @param slider pointer to a slider object
* @param slider pointer to a slider object
* @return
pointer to the knob's style
* @return
true: drag in progress false: not dragged
*/
*/
lv_style_t
*
lv_slider_get_style_knob
(
lv_obj_t
*
slider
)
bool
lv_slider_is_dragged
(
lv_obj_t
*
slider
)
{
{
lv_slider_ext_t
*
ext
=
lv_obj_get_ext_attr
(
slider
);
lv_slider_ext_t
*
ext
=
lv_obj_get_ext_attr
(
slider
);
return
ext
->
style_knob
;
return
ext
->
drag_value
==
LV_SLIDER_NOT_PRESSED
?
false
:
true
;
}
}
/**
/**
...
@@ -368,28 +380,29 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par
...
@@ -368,28 +380,29 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par
}
}
else
if
(
sign
==
LV_SIGNAL_PRESSING
)
{
else
if
(
sign
==
LV_SIGNAL_PRESSING
)
{
lv_indev_get_point
(
param
,
&
p
);
lv_indev_get_point
(
param
,
&
p
);
int16_t
tmp
=
0
;
if
(
w
>
h
)
{
if
(
w
>
h
)
{
lv_coord_t
knob_w
=
h
;
lv_coord_t
knob_w
=
h
;
p
.
x
-=
slider
->
coords
.
x1
+
h
/
2
;
/*Modify the point to shift with half knob (important on the start and end)*/
p
.
x
-=
slider
->
coords
.
x1
+
h
/
2
;
/*Modify the point to shift with half knob (important on the start and end)*/
ext
->
drag_value
=
(
int32_t
)
((
int32_t
)
p
.
x
*
(
ext
->
bar
.
max_value
-
ext
->
bar
.
min_value
+
1
))
/
(
w
-
knob_w
);
tmp
=
(
int32_t
)
((
int32_t
)
p
.
x
*
(
ext
->
bar
.
max_value
-
ext
->
bar
.
min_value
+
1
))
/
(
w
-
knob_w
);
ext
->
drag_value
+=
ext
->
bar
.
min_value
;
tmp
+=
ext
->
bar
.
min_value
;
}
else
{
}
else
{
lv_coord_t
knob_h
=
w
;
lv_coord_t
knob_h
=
w
;
p
.
y
-=
slider
->
coords
.
y1
+
w
/
2
;
/*Modify the point to shift with half knob (important on the start and end)*/
p
.
y
-=
slider
->
coords
.
y1
+
w
/
2
;
/*Modify the point to shift with half knob (important on the start and end)*/
ext
->
drag_value
=
(
int32_t
)
((
int32_t
)
p
.
y
*
(
ext
->
bar
.
max_value
-
ext
->
bar
.
min_value
+
1
))
/
(
h
-
knob_h
);
tmp
=
(
int32_t
)
((
int32_t
)
p
.
y
*
(
ext
->
bar
.
max_value
-
ext
->
bar
.
min_value
+
1
))
/
(
h
-
knob_h
);
ext
->
drag_value
=
ext
->
bar
.
max_value
-
ext
->
drag_value
;
/*Invert the value: smaller value means higher y*/
tmp
=
ext
->
bar
.
max_value
-
tmp
;
/*Invert the value: smaller value means higher y*/
}
}
if
(
ext
->
drag_value
<
ext
->
bar
.
min_value
)
ext
->
drag_value
=
ext
->
bar
.
min_value
;
if
(
tmp
<
ext
->
bar
.
min_value
)
tmp
=
ext
->
bar
.
min_value
;
else
if
(
ext
->
drag_value
>
ext
->
bar
.
max_value
)
ext
->
drag_value
=
ext
->
bar
.
max_value
;
else
if
(
tmp
>
ext
->
bar
.
max_value
)
tmp
=
ext
->
bar
.
max_value
;
lv_obj_invalidate
(
slider
);
}
else
if
(
sign
==
LV_SIGNAL_PRESS_LOST
)
{
ext
->
drag_value
=
LV_SLIDER_NOT_PRESSED
;
lv_obj_invalidate
(
slider
);
if
(
tmp
!=
ext
->
drag_value
)
{
ext
->
drag_value
=
tmp
;
if
(
ext
->
action
!=
NULL
)
ext
->
action
(
slider
);
lv_obj_invalidate
(
slider
);
}
}
}
else
if
(
sign
==
LV_SIGNAL_RELEASED
)
{
else
if
(
sign
==
LV_SIGNAL_RELEASED
||
sign
==
LV_SIGNAL_PRESS_LOST
)
{
lv_slider_set_value
(
slider
,
ext
->
drag_value
);
lv_slider_set_value
(
slider
,
ext
->
drag_value
);
ext
->
drag_value
=
LV_SLIDER_NOT_PRESSED
;
ext
->
drag_value
=
LV_SLIDER_NOT_PRESSED
;
if
(
ext
->
action
!=
NULL
)
ext
->
action
(
slider
);
if
(
ext
->
action
!=
NULL
)
ext
->
action
(
slider
);
...
...
lv_objx/lv_slider.h
View file @
e7055bed
...
@@ -125,10 +125,7 @@ void lv_slider_set_style(lv_obj_t *slider, lv_slider_style_t type, lv_style_t *s
...
@@ -125,10 +125,7 @@ void lv_slider_set_style(lv_obj_t *slider, lv_slider_style_t type, lv_style_t *s
* @param slider pointer to a slider object
* @param slider pointer to a slider object
* @return the value of the slider
* @return the value of the slider
*/
*/
static
inline
int16_t
lv_slider_get_value
(
lv_obj_t
*
slider
)
int16_t
lv_slider_get_value
(
lv_obj_t
*
slider
);
{
return
lv_bar_get_value
(
slider
);
}
/**
/**
* Get the minimum value of a slider
* Get the minimum value of a slider
...
@@ -158,11 +155,11 @@ static inline int16_t lv_slider_get_max_value(lv_obj_t * slider)
...
@@ -158,11 +155,11 @@ static inline int16_t lv_slider_get_max_value(lv_obj_t * slider)
lv_action_t
lv_slider_get_action
(
lv_obj_t
*
slider
);
lv_action_t
lv_slider_get_action
(
lv_obj_t
*
slider
);
/**
/**
*
Set the styles of a slider
*
Give the slider is being dragged or not
* @param slider pointer to a slider object
* @param slider pointer to a slider object
* @return
pointer to the knob's style
* @return
true: drag in progress false: not dragged
*/
*/
lv_style_t
*
lv_slider_get_style_knob
(
lv_obj_t
*
slider
);
bool
lv_slider_is_dragged
(
lv_obj_t
*
slider
);
/**
/**
* Get the 'knob in' attribute of a slider
* Get the 'knob in' attribute of a slider
...
...
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