test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-29 18:48:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

do not dispatch to_background/to_foreground event when popup keyboard

Browse Source
This commit is contained in:
xianjimli 2019-08-09 07:18:41 +08:00
parent cb189f3aca
commit 47bc0e4af6
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.md
View File

@ -2,6 +2,7 @@
* 2019/08/09
* 重构窗口管理器。
* 完善缺省输入法。
* 当前窗口为keyboard时，不触发TO\_BACKGROUND/TO\_FOREGROUND。
* 2019/08/08
* 重构

17
src/window_manager/window_manager_default.c
View File

@ -336,7 +336,9 @@ static ret_t window_manager_check_if_need_open_animation(const idle_info_t* info
if (window_manager_create_animator(wm, curr_win, TRUE) != RET_OK) {
widget_t* prev_win = window_manager_find_prev_window(WIDGET(wm));
if (prev_win != NULL) {
window_manager_dispatch_window_event(prev_win, EVT_WINDOW_TO_BACKGROUND);
if (!widget_is_keyboard(curr_win)) {
window_manager_dispatch_window_event(prev_win, EVT_WINDOW_TO_BACKGROUND);
}
}
window_manager_dispatch_window_event(curr_win, EVT_WINDOW_OPEN);
widget_add_timer(curr_win, on_idle_invalidate, 100);
@ -477,7 +479,9 @@ static ret_t window_manager_default_close_window(widget_t* widget, widget_t* win
if (window_manager_check_if_need_close_animation(wm, window) != RET_OK) {
widget_t* prev_win = window_manager_find_prev_window(WIDGET(wm));
if (prev_win != NULL) {
window_manager_dispatch_window_event(prev_win, EVT_WINDOW_TO_FOREGROUND);
if (!widget_is_keyboard(window)) {
window_manager_dispatch_window_event(prev_win, EVT_WINDOW_TO_FOREGROUND);
}
}
widget_remove_child(widget, window);
idle_add(window_manager_idle_destroy_window, window);
@ -569,6 +573,7 @@ static ret_t window_manager_paint_animation(widget_t* widget, canvas_t* c) {
paint_event_t e;
uint32_t start_time = time_now_ms();
window_manager_default_t* wm = WINDOW_MANAGER_DEFAULT(widget);
bool_t curr_win_is_keyboard = widget_is_keyboard(wm->animator->curr_win);
ENSURE(window_animator_begin_frame(wm->animator) == RET_OK);
@ -594,10 +599,14 @@ static ret_t window_manager_paint_animation(widget_t* widget, canvas_t* c) {
wm->ignore_user_input = FALSE;
if (is_open) {
window_manager_dispatch_window_event(prev_win, EVT_WINDOW_TO_BACKGROUND);
if (!curr_win_is_keyboard) {
window_manager_dispatch_window_event(prev_win, EVT_WINDOW_TO_BACKGROUND);
}
window_manager_dispatch_window_event(curr_win, EVT_WINDOW_OPEN);
} else {
window_manager_dispatch_window_event(prev_win, EVT_WINDOW_TO_FOREGROUND);
if (!curr_win_is_keyboard) {
window_manager_dispatch_window_event(prev_win, EVT_WINDOW_TO_FOREGROUND);
}
}
if (wm->pending_close_window != NULL) {