test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-30 02:58:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve back/back_to_home

Browse Source
This commit is contained in:
lixianjing 2019-11-03 09:34:28 +08:00
parent 1cda15061c
commit 94341a9f5a
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/base/window_manager.c
View File

@ -39,6 +39,16 @@ ret_t window_manager_set(widget_t* widget) {
return RET_OK; return RET_OK;
} }
static ret_t window_manager_close_keyboard(widget_t* widget) {
widget_t* top_window = window_manager_get_top_window(widget);
if(widget_is_keyboard(top_window)) {
window_manager_close_window_force(widget, top_window);
top_window = window_manager_get_top_window(widget);
}
return RET_OK;
}
static ret_t window_manager_default_impl_back(widget_t* widget) { static ret_t window_manager_default_impl_back(widget_t* widget) {
event_t e; event_t e;
widget_t* top_window = window_manager_get_top_window(widget); widget_t* top_window = window_manager_get_top_window(widget);
@ -269,6 +279,8 @@ ret_t window_manager_set_cursor(widget_t* widget, const char* cursor) {
ret_t window_manager_back(widget_t* widget) { ret_t window_manager_back(widget_t* widget) {
window_manager_t* wm = WINDOW_MANAGER(widget); window_manager_t* wm = WINDOW_MANAGER(widget);
return_value_if_fail(wm != NULL && wm->vt != NULL, RET_BAD_PARAMS); return_value_if_fail(wm != NULL && wm->vt != NULL, RET_BAD_PARAMS);
window_manager_close_keyboard(widget);
if (wm->vt->back != NULL) { if (wm->vt->back != NULL) {
return wm->vt->back(widget); return wm->vt->back(widget);
} else { } else {
@ -279,6 +291,7 @@ ret_t window_manager_back_to_home(widget_t* widget) {
window_manager_t* wm = WINDOW_MANAGER(widget); window_manager_t* wm = WINDOW_MANAGER(widget);
return_value_if_fail(wm != NULL && wm->vt != NULL, RET_BAD_PARAMS); return_value_if_fail(wm != NULL && wm->vt != NULL, RET_BAD_PARAMS);
window_manager_close_keyboard(widget);
if (wm->vt->back_to_home != NULL) { if (wm->vt->back_to_home != NULL) {
return wm->vt->back_to_home(widget); return wm->vt->back_to_home(widget);
} else { } else {