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
6abcbe01
Commit
6abcbe01
authored
Feb 06, 2017
by
Gabor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lv_win: lv_win_close_action bugfix
parent
bff43f09
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
lv_win.c
lv_objx/lv_win.c
+4
-4
lv_win.h
lv_objx/lv_win.h
+1
-1
No files found.
lv_objx/lv_win.c
View file @
6abcbe01
...
...
@@ -219,15 +219,15 @@ lv_obj_t * lv_win_add_ctrl_btn(lv_obj_t * win, const char * img_path, lv_action_
* A release action which can be assigned to a window control button to close it
* @param btn pointer to the released button
* @param dispi pointer to the caller display input
* @return always
false
because the button is deleted with the window
* @return always
LV_ACTION_RES_INV
because the button is deleted with the window
*/
bool
lv_win_close_action
(
lv_obj_t
*
btn
,
lv_dispi_t
*
dispi
)
lv_action_res_t
lv_win_close_action
(
lv_obj_t
*
btn
,
lv_dispi_t
*
dispi
)
{
lv_obj_t
*
win
=
lv_win_get_from_ctrl_btn
(
btn
);
lv_obj_del
(
win
);
return
false
;
return
LV_ACTION_RES_INV
;
}
/**
...
...
@@ -368,7 +368,7 @@ static void lv_wins_init(void)
lv_rects_get
(
LV_RECTS_TRANSP
,
&
lv_wins_def
.
ctrl_holder
);
lv_wins_def
.
ctrl_holder
.
hpad
=
0
;
lv_wins_def
.
ctrl_holder
.
vpad
=
0
;
lv_wins_def
.
ctrl_holder
.
opad
=
10
*
LV_DOWNSCALE
;
lv_wins_def
.
ctrl_holder
.
opad
=
5
*
LV_DOWNSCALE
;
lv_btns_get
(
LV_BTNS_DEF
,
&
lv_wins_def
.
ctrl_btn
);
lv_wins_def
.
ctrl_btn
.
bcolor
[
LV_BTN_STATE_REL
]
=
COLOR_MAKE
(
0xD0
,
0xE0
,
0xF0
);
...
...
lv_objx/lv_win.h
View file @
6abcbe01
...
...
@@ -121,7 +121,7 @@ lv_obj_t * lv_win_add_ctrl_btn(lv_obj_t * win, const char * img_path, lv_action_
* @param dispi pointer to the caller display input
* @return always false because the button is deleted with the window
*/
bool
lv_win_close_action
(
lv_obj_t
*
btn
,
lv_dispi_t
*
dispi
);
lv_action_res_t
lv_win_close_action
(
lv_obj_t
*
btn
,
lv_dispi_t
*
dispi
);
/**
* Set the title of a window
...
...
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