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

improve combo box

Browse Source
This commit is contained in:
lixianjing 2019-11-21 15:53:18 +08:00
parent 6f55f198d4
commit 46e427659a
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/widgets/combo_box.c
View File

@ -368,24 +368,25 @@ static ret_t combo_box_active(widget_t* widget) {
widget_t* win = NULL;
combo_box_t* combo_box = COMBO_BOX(widget);
return_value_if_fail(widget != NULL && combo_box != NULL, RET_BAD_PARAMS);
if (combo_box->open_popup) {
win = combo_box->open_popup(widget);
return_value_if_fail(win != NULL, RET_FAIL);
widget_resize(win, widget->w, win->h);
widget_layout_children(win);
} else if (combo_box->open_window) {
if (combo_box->open_window) {
win = window_open(combo_box->open_window);
return_value_if_fail(win != NULL, RET_FAIL);
}
if (win != NULL) {
widget_resize(win, widget->w, win->h);
widget_layout_children(win);
} else {
win = combo_box_create_popup(combo_box);
return_value_if_fail(win != NULL, RET_FAIL);
}
if (combo_box->open_popup) {
win = combo_box->open_popup(widget);
return_value_if_fail(win != NULL, RET_FAIL);
widget_resize(win, widget->w, win->h);
widget_layout_children(win);
} else {
win = combo_box_create_popup(combo_box);
return_value_if_fail(win != NULL, RET_FAIL);
}
}
widget_set_prop_str(win, WIDGET_PROP_MOVE_FOCUS_PREV_KEY, "up");
widget_set_prop_str(win, WIDGET_PROP_MOVE_FOCUS_NEXT_KEY, "down");
combo_box_hook_items(combo_box, win);