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

improve widget_set_focused

Browse Source
This commit is contained in:
xianjimli 2019-05-18 18:38:34 +08:00
parent 322f291ebd
commit eb5fe995cc
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/base/widget.c
View File

@ -375,6 +375,18 @@ ret_t widget_set_focused(widget_t* widget, bool_t focused) {
if (widget->focused != focused) {
widget->focused = focused;
widget_update_style(widget);
if (focused) {
event_t e = event_init(EVT_FOCUS, widget);
widget_set_as_key_target(widget);
widget_dispatch(widget, &e);
} else {
event_t e = event_init(EVT_BLUR, widget);
widget_dispatch(widget, &e);
}
widget_invalidate(widget, NULL);
}
@ -2352,6 +2364,9 @@ ret_t widget_set_as_key_target(widget_t* widget) {
if (widget != NULL) {
if (widget->parent != NULL) {
widget->parent->focused = TRUE;
if(widget->parent->key_target != NULL && widget->parent->key_target != widget) {
widget_dispatch_blur_event(widget->parent->key_target);
}
widget->parent->key_target = widget;
widget_set_as_key_target(widget->parent);
}

11
src/widgets/edit.c
View File

@ -1129,16 +1129,7 @@ ret_t edit_set_focus(widget_t* widget, bool_t focus) {
return_value_if_fail(edit != NULL, RET_BAD_PARAMS);
edit->focus = focus;
widget->focused = focus;
if (focus) {
event_t e = event_init(EVT_FOCUS, widget);
widget_set_as_key_target(widget);
widget_dispatch(widget, &e);
} else {
event_t e = event_init(EVT_BLUR, widget);
widget_dispatch(widget, &e);
}
widget_set_focused(widget, focus);
edit_update_status(widget);
return RET_OK;