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
aa8c80c2
Commit
aa8c80c2
authored
Dec 22, 2016
by
Gabor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor updates
parent
454b0e2a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
11 deletions
+27
-11
lv_app.c
lv_app/lv_app.c
+25
-11
lv_obj.c
lv_obj/lv_obj.c
+2
-0
No files found.
lv_app/lv_app.c
View file @
aa8c80c2
...
...
@@ -574,7 +574,19 @@ static lv_action_res_t lv_app_menu_elem_rel_action(lv_obj_t * app_elem_btn, lv_d
lv_app_sc_open
(
app
);
#if LV_APP_EFFECT_ANIM != 0 && LV_APP_EFFECT_OPA != 0 && LV_APP_ANIM_SC != 0
lv_obj_anim
(
app
->
sc
,
LV_ANIM_FADE
|
ANIM_IN
,
LV_APP_ANIM_SC
,
0
,
NULL
);
anim_t
a
;
a
.
act_time
=
0
;
a
.
time
=
LV_APP_ANIM_SC
;
a
.
end_cb
=
NULL
;
a
.
playback
=
0
;
a
.
repeat
=
0
;
a
.
var
=
app
->
sc
;
a
.
path
=
anim_get_path
(
ANIM_PATH_LIN
);
a
.
end
=
app_style
.
sc_opa
;
a
.
start
=
OPA_TRANSP
;
a
.
fp
=
(
anim_fp_t
)
lv_obj_set_opa
;
anim_create
(
&
a
);
#endif
return
LV_ACTION_RES_INV
;
...
...
@@ -643,14 +655,16 @@ static lv_action_res_t lv_app_sc_rel_action(lv_obj_t * sc, lv_dispi_t * dispi)
/*Connection mode: toggle the connection of 'con_sender' and this app */
else
{
lv_app_inst_t
*
app
=
lv_obj_get_free_p
(
sc
);
lv_btns_t
*
style
=
lv_obj_get_style
(
sc
);
/*Add connection to this application*/
if
(
style
==
&
app_style
.
sc_style
)
{
lv_obj_set_style
(
sc
,
&
app_style
.
sc_rec_style
);
lv_app_set_con
(
con_send
,
app
);
}
else
{
/*Remove the applications connection*/
lv_obj_set_style
(
sc
,
&
app_style
.
sc_style
);
lv_app_del_con
(
con_send
,
app
);
if
(
app
!=
con_send
)
{
/*Do nothing with the sender*/
lv_btns_t
*
style
=
lv_obj_get_style
(
sc
);
/*Add connection to this application*/
if
(
style
==
&
app_style
.
sc_style
)
{
lv_obj_set_style
(
sc
,
&
app_style
.
sc_rec_style
);
lv_app_set_con
(
con_send
,
app
);
}
else
{
/*Remove the applications connection*/
lv_obj_set_style
(
sc
,
&
app_style
.
sc_style
);
lv_app_del_con
(
con_send
,
app
);
}
}
}
...
...
@@ -861,7 +875,7 @@ static lv_action_res_t lv_app_win_minim_anim_create(lv_app_inst_t * app)
a
.
end
=
OPA_TRANSP
;
a
.
start
=
OPA_COVER
;
a
.
fp
=
(
anim_fp_t
)
lv_obj_set_opar
;
a
.
end_cb
=
(
void
(
*
)(
void
*
))
lv_app_win_
minim
_anim_cb
;
a
.
end_cb
=
(
void
(
*
)(
void
*
))
lv_app_win_
close
_anim_cb
;
anim_create
(
&
a
);
#endif
return
LV_ACTION_RES_OK
;
...
...
@@ -902,7 +916,7 @@ static void lv_app_init_style(void)
#else
app_style
.
menu_opa
=
OPA_80
;
app_style
.
menu_btn_opa
=
OPA_50
;
app_style
.
sc_opa
=
OPA_
7
0
;
app_style
.
sc_opa
=
OPA_
8
0
;
#endif
/*Menu style*/
...
...
lv_obj/lv_obj.c
View file @
aa8c80c2
...
...
@@ -805,9 +805,11 @@ void lv_obj_set_ext_size(lv_obj_t * obj, cord_t ext_size)
*/
void
lv_obj_set_style
(
lv_obj_t
*
obj
,
void
*
style
)
{
lv_obj_inv
(
obj
);
if
(
obj
->
style_iso
!=
0
)
{
dm_free
(
obj
->
style_p
);
obj
->
style_iso
=
0
;
}
obj
->
style_p
=
style
;
...
...
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