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

improve widget_get_assets_manager

Browse Source
This commit is contained in:
lixianjing 2019-11-28 17:05:35 +08:00
parent 740efc7ae3
commit f9375ba632
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/base/widget.c
View File

@ -290,20 +290,25 @@ locale_info_t* widget_get_locale_info(widget_t* widget) {
}
assets_manager_t* widget_get_assets_manager(widget_t* widget) {
assets_manager_t* ret = assets_manager();
return_value_if_fail(widget != NULL && widget->vt != NULL, ret);
assets_manager_t* am = assets_manager();
return_value_if_fail(widget != NULL && widget->vt != NULL, am);
if(widget->assets_manager != NULL) {
return widget->assets_manager;
}
if (tk_str_eq(widget->vt->type, WIDGET_TYPE_WINDOW_MANAGER)) {
ret = assets_manager();
am = assets_manager();
} else {
value_t v;
widget_t* win = widget_get_window(widget);
if (widget_get_prop(win, WIDGET_PROP_ASSETS_MANAGER, &v) == RET_OK) {
ret = (assets_manager_t*)value_pointer(&v);
am = (assets_manager_t*)value_pointer(&v);
}
}
widget->assets_manager = am;
return ret;
return am;
}
font_manager_t* widget_get_font_manager(widget_t* widget) {
@ -653,7 +658,6 @@ ret_t widget_destroy_children(widget_t* widget) {
WIDGET_FOR_EACH_CHILD_BEGIN(widget, iter, i)
widget_remove_child_prepare(widget, iter);
iter->parent = NULL;
widget_unref(iter);
WIDGET_FOR_EACH_CHILD_END();
@ -725,6 +729,7 @@ static ret_t widget_remove_child_prepare(widget_t* widget, widget_t* child) {
if (child->vt->on_detach_parent) {
child->vt->on_detach_parent(child, widget);
}
child->parent = NULL;
return RET_OK;
}
@ -734,7 +739,6 @@ ret_t widget_remove_child(widget_t* widget, widget_t* child) {
widget_remove_child_prepare(widget, child);
child->parent = NULL;
return darray_remove(widget->children, child);
}

2
src/base/widget.h
View File

@ -470,6 +470,8 @@ struct _widget_t {
* 虚函数表。
*/
const widget_vtable_t* vt;
/*private*/
assets_manager_t* assets_manager;
};
/**