From ae9cf0ea5cb3733d895f39835e1791715ffd4312 Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Tue, 28 Dec 2010 00:07:31 +0000 Subject: [PATCH] update notebook example; fix listview_icon image size issue. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1227 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- examples/gui/demo_listview_icon.c | 2 +- examples/gui/demo_view_notebook.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/examples/gui/demo_listview_icon.c b/examples/gui/demo_listview_icon.c index b6e2986287..1b6f8693f5 100644 --- a/examples/gui/demo_listview_icon.c +++ b/examples/gui/demo_listview_icon.c @@ -337,7 +337,7 @@ rtgui_view_t* demo_listview_icon_view(rtgui_workbench_t* workbench) (const rt_uint8_t*)image_xpm, sizeof(image_xpm), RT_TRUE); if (exit_icon == RT_NULL) exit_icon = rtgui_image_create_from_mem("xpm", - (const rt_uint8_t*)exit_xpm, sizeof(image_xpm), RT_TRUE); + (const rt_uint8_t*)exit_xpm, sizeof(exit_xpm), RT_TRUE); /* Ìí¼Ó¶¯×÷°´Å¥ */ demo_view_get_rect(view, &rect); diff --git a/examples/gui/demo_view_notebook.c b/examples/gui/demo_view_notebook.c index f6a016dca8..4ec6c7c442 100644 --- a/examples/gui/demo_view_notebook.c +++ b/examples/gui/demo_view_notebook.c @@ -16,6 +16,15 @@ const static struct rtgui_listbox_item items[] = {"list #3", RT_NULL}, }; +const static struct rtgui_listbox_item items2[] = +{ + {"list #0", RT_NULL}, + {"list #1", RT_NULL}, + {"list #2", RT_NULL}, + {"new list #1", RT_NULL}, + {"new list #2", RT_NULL}, +}; + /* 创建用于演示notebook控件的视图 */ rtgui_view_t* demo_view_notebook(rtgui_workbench_t* workbench) { @@ -30,12 +39,15 @@ rtgui_view_t* demo_view_notebook(rtgui_workbench_t* workbench) /* 获得视图的ä½ç½®ä¿¡æ¯ */ demo_view_get_rect(view, &rect); - notebook = rtgui_notebook_create(&rect); + notebook = rtgui_notebook_create(&rect, RTGUI_NOTEBOOK_BOTTOM); /* view是一个container控件，调用add_child方法添加这个notebook控件 */ rtgui_container_add_child(RTGUI_CONTAINER(view), RTGUI_WIDGET(notebook)); box = rtgui_listbox_create(items, sizeof(items)/sizeof(struct rtgui_listbox_item), &rect); rtgui_notebook_add(notebook, "Tab 1", RTGUI_WIDGET(box)); + box = rtgui_listbox_create(items2, sizeof(items2)/sizeof(struct rtgui_listbox_item), &rect); + rtgui_notebook_add(notebook, "Tab 2", RTGUI_WIDGET(box)); + return view; }