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

improve layout

Browse Source
This commit is contained in:
jim 2018-03-12 07:12:35 +08:00
parent df59a079ba
commit d96c0ec537
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/base/layout.c
View File

@ -28,12 +28,12 @@ widget_layout_t* widget_layout_parse(widget_layout_t* layout, const char* x, con
memset(layout, 0x00, sizeof(*layout));
if (x != NULL) {
if (strstr(x, "center") != NULL) {
if (x[0] == 'c') {
if (x[6] == ':') {
layout->x = atoi(x + 7);
}
layout->x_attr = X_ATTR_CENTER;
} else if (strstr(x, "right") != NULL) {
} else if (x[0] == 'r') {
if (x[5] == ':') {
layout->x = atoi(x + 6);
}
@ -50,12 +50,12 @@ widget_layout_t* widget_layout_parse(widget_layout_t* layout, const char* x, con
}
if (y != NULL) {
if (strstr(y, "middle") != NULL) {
if (y[0] == 'm') {
if (y[6] == ':') {
layout->y = atoi(y + 7);
}
layout->y_attr = Y_ATTR_MIDDLE;
} else if (strstr(y, "bottom") != NULL) {
} else if (y[0] == 'b') {
if (y[6] == ':') {
layout->y = atoi(y + 7);
}
@ -251,7 +251,7 @@ ret_t widget_layout_children(widget_t* widget) {
iter = children[i];
widget_move_resize(iter, x, y, iter->w, h);
x += iter->w + cell_spacing;
return_value_if_fail(x < widget->w, RET_BAD_PARAMS);
return_value_if_fail(x <= widget->w, RET_BAD_PARAMS);
}
for (i = 0; i < n; i++) {
@ -270,9 +270,9 @@ ret_t widget_layout_children(widget_t* widget) {
for (i = 0; i < n; i++) {
iter = children[i];
return_value_if_fail(y <= widget->h, RET_BAD_PARAMS);
widget_move_resize(iter, x, y, w, iter->h);
y += iter->h + cell_spacing;
return_value_if_fail(y < widget->h, RET_BAD_PARAMS);
}
for (i = 0; i < n; i++) {
@ -293,6 +293,8 @@ ret_t widget_layout_children(widget_t* widget) {
for (i = 0; i < n; i++) {
iter = children[i];
return_value_if_fail(y <= widget->h, RET_BAD_PARAMS);
widget_move_resize(iter, x, y, item_w, item_h);
c++;
if (c == cols) {
@ -303,7 +305,6 @@ ret_t widget_layout_children(widget_t* widget) {
} else {
x += item_w + cell_spacing;
}
return_value_if_fail(y < widget->h, RET_BAD_PARAMS);
}
for (i = 0; i < n; i++) {

4
src/ui_loader/ui_builder_default.c
View File

@ -152,6 +152,9 @@ static ret_t ui_builder_default_on_widget_prop_end(ui_builder_t* b) {
static ret_t ui_builder_default_on_widget_end(ui_builder_t* b) {
b->widget = b->widget->parent;
if(b->widget == b->root) {
widget_layout(b->root);
}
return RET_OK;
}
@ -177,7 +180,6 @@ widget_t* window_open(const char* name) {
ui_loader_load(loader, ui->data, ui->size, builder);
resource_manager_unref(ui);
widget_layout(builder->root);
return builder->root;
}