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 widget_set_focused

Browse Source
This commit is contained in:
xianjimli 2019-05-18 18:42:24 +08:00
parent eb5fe995cc
commit f65604b7e8
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/base/widget.c
View File

@ -386,7 +386,7 @@ ret_t widget_set_focused(widget_t* widget, bool_t focused) {
widget_dispatch(widget, &e);
}
widget_invalidate(widget, NULL);
}
@ -1094,10 +1094,15 @@ ret_t widget_set_prop(widget_t* widget, const char* name, const value_t* v) {
}
if (ret == RET_NOT_FOUND) {
if (widget->custom_props == NULL) {
widget->custom_props = object_default_create();
if (tk_str_eq(name, WIDGET_PROP_FOCUS)) {
widget_set_focused(widget, value_bool(v));
ret = RET_OK;
} else {
if (widget->custom_props == NULL) {
widget->custom_props = object_default_create();
}
ret = object_set_prop(widget->custom_props, name, v);
}
ret = object_set_prop(widget->custom_props, name, v);
}
if (ret != RET_NOT_FOUND) {
@ -2364,7 +2369,7 @@ 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) {
if (widget->parent->key_target != NULL && widget->parent->key_target != widget) {
widget_dispatch_blur_event(widget->parent->key_target);
}
widget->parent->key_target = widget;

2
src/base/window_manager.c
View File

@ -393,7 +393,7 @@ ret_t window_manager_open_window(widget_t* widget, widget_t* window) {
window->dirty = FALSE;
widget->target = window;
if(!widget_is_keyboard(window)) {
if (!widget_is_keyboard(window)) {
widget->key_target = window;
}
widget_invalidate(window, NULL);

2
src/ext_widgets/text_selector/text_selector.c
View File

@ -450,7 +450,7 @@ widget_t* text_selector_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h)
text_selector->visible_nr = 5;
text_selector->pressed = FALSE;
return widget;
}