Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-23 12:15:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sync with github bd3351e572

Browse Source 
As always, full log is in GitHub.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2234 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
dzzxzz@gmail.com
2012-07-26 06:36:49 +00:00
parent f7fbd6bc6d
commit 08e05eb3b4
11 changed files with 599 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/rtgui/widgets/notebook.c
+11 -5
View File
@@ -231,6 +231,8 @@ void rtgui_notebook_add(struct rtgui_notebook* notebook, const char* label, stru
void rtgui_notebook_remove(struct rtgui_notebook* notebook, rt_uint16_t index)
{
struct rtgui_notebook_tab tab;
rt_bool_t need_update = RT_FALSE;
RT_ASSERT(notebook != RT_NULL);
if (index < notebook->count)
@@ -244,8 +246,11 @@ void rtgui_notebook_remove(struct rtgui_notebook* notebook, rt_uint16_t index)
}
else
{
if (notebook->current == index)
need_update = RT_TRUE;
tab = notebook->childs[index];
for (;index < notebook->count - 1; index ++)
for (;index < notebook->count - 1; index++)
{
notebook->childs[index] = notebook->childs[index + 1];
}
@@ -255,16 +260,17 @@ void rtgui_notebook_remove(struct rtgui_notebook* notebook, rt_uint16_t index)
sizeof(struct rtgui_notebook_tab) * notebook->count);
}
// FIXME: do we really want to destroy it?
rtgui_widget_destroy(tab.widget);
rtgui_free(tab.title);
if (notebook->current == index)
if (need_update)
{
/* update tab */
if (notebook->current > notebook->count - 1)
notebook->current = notebook->count - 1;
rtgui_widget_hide(tab.widget);
rtgui_widget_show(notebook->childs[notebook->current].widget);
rtgui_widget_update(RTGUI_WIDGET(notebook));
rtgui_widget_set_parent(tab.widget, RT_NULL);
}
}
}