diff options
| author | Grissiom <[email protected]> | 2013-02-01 10:27:10 +0800 |
|---|---|---|
| committer | Grissiom <[email protected]> | 2013-02-01 10:27:10 +0800 |
| commit | f06c70feed0941b5bceedcecf89e9aa22034aca8 (patch) | |
| tree | 89fd3a989b4d88fc72b39eaad6567de3a3d23874 /components/rtgui/widgets/box.c | |
| parent | 4f02e67bef7eacee5102d7730356663d9c889e15 (diff) | |
sync with rtgui-0.6
Diffstat (limited to 'components/rtgui/widgets/box.c')
| -rw-r--r-- | components/rtgui/widgets/box.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/rtgui/widgets/box.c b/components/rtgui/widgets/box.c index 47c704b7c9..448f47ea36 100644 --- a/components/rtgui/widgets/box.c +++ b/components/rtgui/widgets/box.c @@ -73,7 +73,7 @@ static void rtgui_box_layout_vertical(struct rtgui_box *box, struct rtgui_rect * { rtgui_widget_t *widget = rtgui_list_entry(node, struct rtgui_widget, sibling); if (widget->align & RTGUI_ALIGN_STRETCH) space_count ++; - else total_height += widget->mini_height; + else total_height += widget->min_height; } /* calculate the height for each spaces */ @@ -98,8 +98,8 @@ static void rtgui_box_layout_vertical(struct rtgui_box *box, struct rtgui_rect * /* reset rect */ rtgui_rect_moveto(rect, -rect->x1, -rect->y1); - rect->x2 = widget->mini_width; - rect->y2 = widget->mini_height; + rect->x2 = widget->min_width; + rect->y2 = widget->min_height; /* left in default */ rtgui_rect_moveto(rect, next_x, next_y); @@ -166,7 +166,7 @@ static void rtgui_box_layout_horizontal(struct rtgui_box *box, struct rtgui_rect { rtgui_widget_t *widget = rtgui_list_entry(node, struct rtgui_widget, sibling); if (widget->align & RTGUI_ALIGN_STRETCH) space_count ++; - else total_width += widget->mini_width; + else total_width += widget->min_width; } if (space_count != 0) @@ -191,8 +191,8 @@ static void rtgui_box_layout_horizontal(struct rtgui_box *box, struct rtgui_rect /* reset rect */ rtgui_rect_moveto(rect, -rect->x1, -rect->y1); - rect->x2 = widget->mini_width; - rect->y2 = widget->mini_height; + rect->x2 = widget->min_width; + rect->y2 = widget->min_height; /* top in default */ rtgui_rect_moveto(rect, next_x, next_y); |