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
0d938168
Commit
0d938168
authored
Mar 22, 2018
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lv_group_create: init focus_cb
parent
ca95d766
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
lv_group.c
lv_core/lv_group.c
+6
-4
lv_obj.c
lv_core/lv_obj.c
+5
-0
No files found.
lv_core/lv_group.c
View file @
0d938168
...
...
@@ -47,6 +47,7 @@ lv_group_t * lv_group_create(void)
group
->
style_mod
=
style_mod_def
;
group
->
obj_focus
=
NULL
;
group
->
frozen
=
0
;
group
->
focus_cb
=
NULL
;
return
group
;
}
...
...
@@ -88,6 +89,10 @@ void lv_group_remove_obj(lv_obj_t * obj)
lv_group_t
*
g
=
obj
->
group_p
;
if
(
g
==
NULL
)
return
;
if
(
*
g
->
obj_focus
==
obj
)
{
lv_group_focus_next
(
g
);
}
/*Search the object and remove it from its group */
lv_obj_t
**
i
;
LL_READ
(
g
->
obj_ll
,
i
)
{
...
...
@@ -98,10 +103,7 @@ void lv_group_remove_obj(lv_obj_t * obj)
}
}
if
(
*
g
->
obj_focus
==
obj
)
{
g
->
obj_focus
=
NULL
;
lv_group_focus_next
(
g
);
}
}
/**
...
...
lv_core/lv_obj.c
View file @
0d938168
...
...
@@ -284,6 +284,11 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
lv_anim_del
(
obj
,
NULL
);
#endif
/*Delete from the group*/
#if USE_LV_GROUP
if
(
obj
->
group_p
!=
NULL
)
lv_group_remove_obj
(
obj
);
#endif
/* Reset all input devices if
* the currently pressed object is deleted*/
lv_indev_t
*
indev
=
lv_indev_next
(
NULL
);
...
...
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