add more demo features in listbox and listctrl.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1263 bbd45198-f89e-11dd-88c7-29a3b14d5316

2 files changed, 303 insertions, 14 deletions

diff --git a/examples/gui/demo_view_listbox.c b/examples/gui/demo_view_listbox.c
index bc37f820c5..b098d719ce 100644
--- a/examples/gui/demo_view_listbox.c
+++ b/examples/gui/demo_view_listbox.c
@@ -7,7 +7,133 @@
 #include <rtgui/widgets/label.h>

 #include <rtgui/widgets/listbox.h>

 

-const static struct rtgui_listbox_item items[] = 

+static rtgui_image_t* item_icon = RT_NULL;

+static const char * image_xpm[] = {

+	"16 16 106 2",

+	"  	c None",

+	". 	c #D0C83F",

+	"+ 	c #D0C840",

+	"@ 	c #D0C030",

+	"# 	c #D0B820",

+	"$ 	c #D0B020",

+	"% 	c #D0B01F",

+	"& 	c #5F571F",

+	"* 	c #F0F0C0",

+	"= 	c #FFF8D0",

+	"- 	c #FFF8C0",

+	"; 	c #FFF8B0",

+	"> 	c #FFF8A0",

+	", 	c #F0E870",

+	"' 	c #707030",

+	") 	c #4F87EF",

+	"! 	c #4F78C0",

+	"~ 	c #5088E0",

+	"{ 	c #5078C0",

+	"] 	c #C0D0F0",

+	"^ 	c #FFF8E0",

+	"/ 	c #FFF090",

+	"( 	c #F0E070",

+	"_ 	c #6F97D0",

+	": 	c #C0D8FE",

+	"< 	c #80A8F0",

+	"[ 	c #7088D0",

+	"} 	c #B0D0FF",

+	"| 	c #90B0F0",

+	"1 	c #1040A0",

+	"2 	c #F0F080",

+	"3 	c #707040",

+	"4 	c #7098F0",

+	"5 	c #3068E0",

+	"6 	c #A0B8F0",

+	"7 	c #4070C0",

+	"8 	c #002880",

+	"9 	c #404040",

+	"0 	c #505050",

+	"a 	c #F0F090",

+	"b 	c #F0E860",

+	"c 	c #F0D860",

+	"d 	c #807840",

+	"e 	c #2F5FC0",

+	"f 	c #1050D0",

+	"g 	c #1048B0",

+	"h 	c #002870",

+	"i 	c #C0C080",

+	"j 	c #C0C070",

+	"k 	c #F0F070",

+	"l 	c #F0E060",

+	"m 	c #E0D050",

+	"n 	c #00277F",

+	"o 	c #00287F",

+	"p 	c #1F3F6F",

+	"q 	c #1048C0",

+	"r 	c #0040B0",

+	"s 	c #204080",

+	"t 	c #FFF890",

+	"u 	c #F0D850",

+	"v 	c #E0C840",

+	"w 	c #807040",

+	"x 	c #A0B06F",

+	"y 	c #204880",

+	"z 	c #2048A0",

+	"A 	c #90A8C0",

+	"B 	c #FFF080",

+	"C 	c #F0D050",

+	"D 	c #C0A830",

+	"E 	c #6F682F",

+	"F 	c #F0F0A0",

+	"G 	c #E0D060",

+	"H 	c #B0A040",

+	"I 	c #D0B840",

+	"J 	c #E0C040",

+	"K 	c #D0B030",

+	"L 	c #706820",

+	"M 	c #5F581F",

+	"N 	c #CFBF3F",

+	"O 	c #FFF0A0",

+	"P 	c #A09830",

+	"Q 	c #A08820",

+	"R 	c #908030",

+	"S 	c #807830",

+	"T 	c #707020",

+	"U 	c #605820",

+	"V 	c #6F672F",

+	"W 	c #D0C040",

+	"X 	c #F0E880",

+	"Y 	c #907820",

+	"Z 	c #B09820",

+	"` 	c #B09010",

+	" .	c #B08820",

+	"..	c #806820",

+	"+.	c #5F5F1F",

+	"@.	c #F0E080",

+	"#.	c #B09020",

+	"$.	c #C0B040",

+	"%.	c #A09030",

+	"&.	c #908020",

+	"*.	c #606020",

+	"=.	c #6F5F1F",

+	"-.	c #9F982F",

+	";.	c #A0872F",

+	">.	c #6F681F",

+	",.	c #706020",

+	"                                ",

+	"          . + + + @ @ # # $ % & ",

+	"          + * = = = = - ; > , ' ",

+	"  ) !     ~ { ] ^ = - - > / ( ' ",

+	"_ : < { [ } | 1 - ; > > / 2 ( 3 ",

+	"{ 4 5 1 6 7 5 8 9 0 a / , b c d ",

+	"e f g h 8 8 g h i j / k l c m d ",

+	"  n o   p q r s t 2 , l c u v w ",

+	"        x y z A B , l u C v D E ",

+	"        @ F > t k G H I J K L M ",

+	"      N @ O / 2 l P Q R S T U V ",

+	"      W m 2 X l I Y Z `  ...+.  ",

+	"      W @.l u I R #.Z Y U M     ",

+	"    $.G I $.%.R &.Y *.& =.      ",

+	"  -.;.>.,.L L ,.& M             ",

+	"                                "};

+

+static struct rtgui_listbox_item items[] =

 {

 	{"list #0", RT_NULL},

 	{"list #1", RT_NULL},

@@ -36,6 +162,11 @@ rtgui_view_t* demo_view_listbox(rtgui_workbench_t* workbench)
 	/* 先创建一个演示用的视图 */

 	view = demo_view(workbench, "ListBox Demo");

 

+	if (item_icon == RT_NULL)

+		item_icon = rtgui_image_create_from_mem("xpm",

+			(const rt_uint8_t*)image_xpm, sizeof(image_xpm), RT_TRUE);

+	items[1].image = item_icon;

+

 	/* 获得视图的位置信息 */

 	demo_view_get_rect(view, &rect);

 	rect.x1 += 5;

diff --git a/examples/gui/demo_view_listctrl.c b/examples/gui/demo_view_listctrl.c
index eab4cd2823..50846e2b9d 100644
--- a/examples/gui/demo_view_listctrl.c
+++ b/examples/gui/demo_view_listctrl.c
@@ -7,7 +7,133 @@
 #include <rtgui/widgets/label.h>

 #include <rtgui/widgets/listctrl.h>

 

-const static struct list_item

+static rtgui_image_t* item_icon = RT_NULL;

+static const char * image_xpm[] = {

+	"16 16 106 2",

+	"  	c None",

+	". 	c #D0C83F",

+	"+ 	c #D0C840",

+	"@ 	c #D0C030",

+	"# 	c #D0B820",

+	"$ 	c #D0B020",

+	"% 	c #D0B01F",

+	"& 	c #5F571F",

+	"* 	c #F0F0C0",

+	"= 	c #FFF8D0",

+	"- 	c #FFF8C0",

+	"; 	c #FFF8B0",

+	"> 	c #FFF8A0",

+	", 	c #F0E870",

+	"' 	c #707030",

+	") 	c #4F87EF",

+	"! 	c #4F78C0",

+	"~ 	c #5088E0",

+	"{ 	c #5078C0",

+	"] 	c #C0D0F0",

+	"^ 	c #FFF8E0",

+	"/ 	c #FFF090",

+	"( 	c #F0E070",

+	"_ 	c #6F97D0",

+	": 	c #C0D8FE",

+	"< 	c #80A8F0",

+	"[ 	c #7088D0",

+	"} 	c #B0D0FF",

+	"| 	c #90B0F0",

+	"1 	c #1040A0",

+	"2 	c #F0F080",

+	"3 	c #707040",

+	"4 	c #7098F0",

+	"5 	c #3068E0",

+	"6 	c #A0B8F0",

+	"7 	c #4070C0",

+	"8 	c #002880",

+	"9 	c #404040",

+	"0 	c #505050",

+	"a 	c #F0F090",

+	"b 	c #F0E860",

+	"c 	c #F0D860",

+	"d 	c #807840",

+	"e 	c #2F5FC0",

+	"f 	c #1050D0",

+	"g 	c #1048B0",

+	"h 	c #002870",

+	"i 	c #C0C080",

+	"j 	c #C0C070",

+	"k 	c #F0F070",

+	"l 	c #F0E060",

+	"m 	c #E0D050",

+	"n 	c #00277F",

+	"o 	c #00287F",

+	"p 	c #1F3F6F",

+	"q 	c #1048C0",

+	"r 	c #0040B0",

+	"s 	c #204080",

+	"t 	c #FFF890",

+	"u 	c #F0D850",

+	"v 	c #E0C840",

+	"w 	c #807040",

+	"x 	c #A0B06F",

+	"y 	c #204880",

+	"z 	c #2048A0",

+	"A 	c #90A8C0",

+	"B 	c #FFF080",

+	"C 	c #F0D050",

+	"D 	c #C0A830",

+	"E 	c #6F682F",

+	"F 	c #F0F0A0",

+	"G 	c #E0D060",

+	"H 	c #B0A040",

+	"I 	c #D0B840",

+	"J 	c #E0C040",

+	"K 	c #D0B030",

+	"L 	c #706820",

+	"M 	c #5F581F",

+	"N 	c #CFBF3F",

+	"O 	c #FFF0A0",

+	"P 	c #A09830",

+	"Q 	c #A08820",

+	"R 	c #908030",

+	"S 	c #807830",

+	"T 	c #707020",

+	"U 	c #605820",

+	"V 	c #6F672F",

+	"W 	c #D0C040",

+	"X 	c #F0E880",

+	"Y 	c #907820",

+	"Z 	c #B09820",

+	"` 	c #B09010",

+	" .	c #B08820",

+	"..	c #806820",

+	"+.	c #5F5F1F",

+	"@.	c #F0E080",

+	"#.	c #B09020",

+	"$.	c #C0B040",

+	"%.	c #A09030",

+	"&.	c #908020",

+	"*.	c #606020",

+	"=.	c #6F5F1F",

+	"-.	c #9F982F",

+	";.	c #A0872F",

+	">.	c #6F681F",

+	",.	c #706020",

+	"                                ",

+	"          . + + + @ @ # # $ % & ",

+	"          + * = = = = - ; > , ' ",

+	"  ) !     ~ { ] ^ = - - > / ( ' ",

+	"_ : < { [ } | 1 - ; > > / 2 ( 3 ",

+	"{ 4 5 1 6 7 5 8 9 0 a / , b c d ",

+	"e f g h 8 8 g h i j / k l c m d ",

+	"  n o   p q r s t 2 , l c u v w ",

+	"        x y z A B , l u C v D E ",

+	"        @ F > t k G H I J K L M ",

+	"      N @ O / 2 l P Q R S T U V ",

+	"      W m 2 X l I Y Z `  ...+.  ",

+	"      W @.l u I R #.Z Y U M     ",

+	"    $.G I $.%.R &.Y *.& =.      ",

+	"  -.;.>.,.L L ,.& M             ",

+	"                                "};

+

+static struct list_item

 {

 	const char* name;

 	const char* gender;

@@ -15,9 +141,26 @@ const static struct list_item
 	rtgui_image_t* image;

 } items[] = 

 {

-	{"bernard", "��", 30, RT_NULL},

-	{"˾����", "��", 1024, RT_NULL},

-	{"����", "��", 28, RT_NULL},

+	{"index0", "00", 30, RT_NULL},

+	{"index1", "m1", 30, RT_NULL},

+	{"index2", "m2", 30, RT_NULL},

+	{"index3", "m3", 30, RT_NULL},

+	{"index4", "m4", 30, RT_NULL},

+	{"index5", "m5", 30, RT_NULL},

+	{"index6", "m6", 30, RT_NULL},

+	{"index7", "m7", 30, RT_NULL},

+	{"index8", "m8", 30, RT_NULL},

+	{"index9", "m9", 30, RT_NULL},

+	{"index10", "m10", 30, RT_NULL},

+	{"index11", "m11", 30, RT_NULL},

+	{"index12", "m12", 30, RT_NULL},

+	{"index13", "m13", 30, RT_NULL},

+	{"index14", "m14", 30, RT_NULL},

+	{"index15", "m15", 30, RT_NULL},

+	{"index16", "m16", 30, RT_NULL},

+	{"index17", "m17", 30, RT_NULL},

+	{"index18", "m18", 30, RT_NULL},

+	{"index19", "m19", 30, RT_NULL},

 };

 

 void _rtgui_listctrl_item_draw(struct rtgui_listctrl *list, struct rtgui_dc* dc, rtgui_rect_t* rect, rt_uint16_t index)

@@ -31,21 +174,31 @@ void _rtgui_listctrl_item_draw(struct rtgui_listctrl *list, struct rtgui_dc* dc,
 	items = (struct list_item*)list->items;

 	item = &items[index];

 

-	if (item->image != RT_NULL)

-	{

-		rtgui_image_blit(item->image, dc, &item_rect);

-		item_rect.x1 += item->image->w + 3;

-	}

-

 	/* draw text */

-	rtgui_dc_draw_text(dc, item->name, &item_rect); item_rect.x1 += 80;

+	rtgui_dc_draw_text(dc, item->name, &item_rect); item_rect.x1 += 60;

 	rtgui_dc_draw_vline(dc, item_rect.x1, item_rect.y1, item_rect.y2);

+

 	item_rect.x1 += 5;

-	rtgui_dc_draw_text(dc, item->gender, &item_rect); item_rect.x1 += 80;

+	rtgui_dc_draw_text(dc, item->gender, &item_rect); item_rect.x1 += 60;

 	rtgui_dc_draw_vline(dc, item_rect.x1, item_rect.y1, item_rect.y2);

+

 	item_rect.x1 += 5;

 	rt_snprintf(age_str, sizeof(age_str), "%d", item->age);

-	rtgui_dc_draw_text(dc, age_str, &item_rect);

+	rtgui_dc_draw_text(dc, age_str, &item_rect); item_rect.x1 += 40;

+	rtgui_dc_draw_vline(dc, item_rect.x1, item_rect.y1, item_rect.y2);

+

+	item_rect.x1 += 5;

+

+	/* draw image */

+	if (item->image != RT_NULL)

+	{

+		rtgui_rect_t image_rect;

+

+		image_rect.x1 = 0; image_rect.y1 = 0;

+		image_rect.x2 = item->image->w; image_rect.y2 = item->image->h;

+		rtgui_rect_moveto_align(&item_rect, &image_rect, RTGUI_ALIGN_CENTER_VERTICAL);

+		rtgui_image_blit(item->image, dc, &image_rect);

+	}

 }

 

 static void on_items(rtgui_widget_t* widget, struct rtgui_event* event)

@@ -69,6 +222,11 @@ rtgui_view_t* demo_view_listctrl(rtgui_workbench_t* workbench)
 	/* �ȴ���һ����ʾ�õ���ͼ */

 	view = demo_view(workbench, "List Control Demo");

 

+	if (item_icon == RT_NULL)

+		item_icon = rtgui_image_create_from_mem("xpm",

+			(const rt_uint8_t*)image_xpm, sizeof(image_xpm), RT_TRUE);

+	items[1].image = item_icon;

+

 	/* �����ͼ��λ����Ϣ */

 	demo_view_get_rect(view, &rect);

 	rect.x1 += 5;