test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-03 12:37:43 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix combobox animation

Browse Source
This commit is contained in:
xianjimli 2020-02-11 17:39:38 +08:00
parent 8fa22401e1
commit ec0b2e088b
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/window_manager/window_manager_default.c
View File

@ -216,7 +216,10 @@ ret_t window_manager_default_snap_prev_window(widget_t* widget, widget_t* prev_w
for (; start <= end; ++start) {
widget_t* iter = children[start];
if (widget_is_system_bar(iter) || !iter->visible) continue;
ENSURE(widget_paint(iter, c) == RET_OK);
/* 过滤 curr_win 的对象 */
if(iter != wm->curr_win) {
ENSURE(widget_paint(iter, c) == RET_OK);
}
}
}
@ -236,7 +239,10 @@ ret_t window_manager_default_snap_prev_window(widget_t* widget, widget_t* prev_w
for (; start <= end; ++start) {
widget_t* iter = children[start];
if (widget_is_system_bar(iter) || !iter->visible) continue;
ENSURE(widget_paint(iter, c) == RET_OK);
/* 过滤 curr_win 的对象 */
if(iter != wm->curr_win) {
ENSURE(widget_paint(iter, c) == RET_OK);
}
}
}
@ -250,7 +256,7 @@ ret_t window_manager_default_snap_prev_window(widget_t* widget, widget_t* prev_w
if (dialog_highlighter != NULL) {
dialog_highlighter_set_bg(dialog_highlighter, img, fbo);
}
wm->curr_win = NULL;
return RET_OK;
}
@ -356,6 +362,7 @@ static ret_t window_manager_create_animator(window_manager_default_t* wm, widget
if (anim_hint && *anim_hint) {
canvas_t* c = native_window_get_canvas(wm->native_window);
window_manager_default_create_dialog_highlighter(WIDGET(wm), curr_win);
wm->curr_win = curr_win;
if (open) {
wm->animator = window_animator_create_for_open(anim_hint, c, prev_win, curr_win);
} else {

4
src/window_manager/window_manager_default.h
View File

@ -57,6 +57,10 @@ typedef struct _window_manager_default_t {
uint32_t screen_saver_time;
widget_t* prev_win;
/* for window_manager_default_snap_prev_window */
widget_t* curr_win;
native_window_t* native_window;
dialog_highlighter_t* dialog_highlighter;