chinky/rtt-f030
chinky/rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix no image case in listview.

Browse Source 
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1309 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong@gmail.com 2011-03-06 02:38:59 +00:00
parent cee08f0160
commit 1090e48f01
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/rtgui/widgets/list_view.c
View File

@ -558,15 +558,25 @@ rt_bool_t rtgui_list_view_event_handler(struct rtgui_widget* widget, struct rtgu
static void rtgui_list_view_calc(struct rtgui_list_view* view) static void rtgui_list_view_calc(struct rtgui_list_view* view)
{ {
/* get image of first item*/
rtgui_image_t *image;
rtgui_rect_t rect; rtgui_rect_t rect;
rt_uint32_t image_width, image_height;
rt_ubase_t text_width, text_height; rt_ubase_t text_width, text_height;
rt_ubase_t item_width, item_height; rt_ubase_t item_width, item_height;
if (view->items_count == 0) return; if (view->items_count == 0) return;
image = view->items[0].image; /* get image width and height */
if (view->items[0].image != RT_NULL)
{
image_width = view->items[0].image->w;
image_height = view->items[0].image->h;
}
else
{
image_width = 0;
image_height = 0;
}
rtgui_font_get_metrics(RTGUI_WIDGET_FONT(RTGUI_WIDGET(view)), "HHHHHH", &rect); rtgui_font_get_metrics(RTGUI_WIDGET_FONT(RTGUI_WIDGET(view)), "HHHHHH", &rect);
text_height = rtgui_rect_height(rect); text_height = rtgui_rect_height(rect);
@ -574,9 +584,9 @@ static void rtgui_list_view_calc(struct rtgui_list_view* view)
rtgui_widget_get_rect(RTGUI_WIDGET(view), &rect); rtgui_widget_get_rect(RTGUI_WIDGET(view), &rect);
item_width = (image->w + LIST_MARGIN); item_width = (image_width + LIST_MARGIN);
if (item_width < (text_width + LIST_MARGIN)) item_width = text_width + LIST_MARGIN; if (item_width < (text_width + LIST_MARGIN)) item_width = text_width + LIST_MARGIN;
item_height = image->h + 8 + text_height + LIST_MARGIN; item_height = image_height + 8 + text_height + LIST_MARGIN;
if (item_width > item_height) item_height = item_width; if (item_width > item_height) item_height = item_width;
else item_width = item_height; else item_width = item_height;