From c260b4d77fce75937738bf12e9ffa1c78e9dff4e Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Wed, 22 Dec 2010 23:57:44 +0000 Subject: update notebook control. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1223 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/rtgui/widgets/notebook.c | 146 ++++++++++++++++++++++++++++++++++-- components/rtgui/widgets/widget.c | 2 +- 2 files changed, 140 insertions(+), 8 deletions(-) (limited to 'components/rtgui/widgets') diff --git a/components/rtgui/widgets/notebook.c b/components/rtgui/widgets/notebook.c index eed59c99d4..0ab8a375a2 100644 --- a/components/rtgui/widgets/notebook.c +++ b/components/rtgui/widgets/notebook.c @@ -1,23 +1,145 @@ +#include #include +#include #include +static void _rtgui_notebook_constructor(rtgui_notebook_t *notebook) +{ + notebook->childs = RT_NULL; + notebook->count = 0; + notebook->current = RTGUI_NOT_FOUND; +} + +static void _rtgui_notebook_destructor(rtgui_notebook_t *notebook) +{ + int index; + + if (notebook->childs != RT_NULL) + { + for (index = 0; index < notebook->count; index ++) + { + rtgui_widget_destroy(notebook->childs[index].widget); + rt_free(notebook->childs[index].title); + } + + rtgui_free(notebook->childs); + } +} + +static void _rtgui_notebook_ondraw(rtgui_notebook_t *notebook) +{ + struct rtgui_dc* dc; + rtgui_rect_t rect; + int index; + + dc = rtgui_dc_begin_drawing(RTGUI_WIDGET(notebook)); + if (dc == RT_NULL) return; + + rtgui_widget_get_rect(RTGUI_WIDGET(notebook), &rect); + + if (notebook->count == 0) + { + rtgui_dc_fill_rect(dc, &rect); + } + else + { + /* draw tab bar */ + for (index = 0; index < notebook->count; index ++) + { + } + + /* draw current tab */ + rtgui_widget_update(notebook->childs[notebook->current].widget); + } + rtgui_dc_end_drawing(dc); +} + rtgui_type_t *rtgui_notebook_type_get(void) { + static rtgui_type_t *noteboot_type = RT_NULL; + + if (!noteboot_type) + { + noteboot_type = rtgui_type_create("notebook", RTGUI_WIDGET_TYPE, + sizeof(rtgui_notebook_t), + RTGUI_CONSTRUCTOR(_rtgui_notebook_constructor), + RTGUI_DESTRUCTOR(_rtgui_notebook_destructor)); + } + + return noteboot_type; } rtgui_notebook_t* rtgui_notebook_create(const rtgui_rect_t* rect) { + struct rtgui_notebook* notebook; + + notebook = (struct rtgui_notebook*) rtgui_widget_create (RTGUI_NOTEBOOK_TYPE); + if (notebook != RT_NULL) + { + rtgui_widget_set_rect(RTGUI_WIDGET(notebook), rect); + } + + return notebook; } void rtgui_notebook_destroy(rtgui_notebook_t* notebook) { + rtgui_widget_destroy(RTGUI_WIDGET(notebook)); } void rtgui_notebook_add(rtgui_notebook_t* notebook, const char* label, rtgui_widget_t* child) { + RT_ASSERT(notebook != RT_NULL); + + notebook->count += 1; + notebook->childs = (struct rtgui_notebook_tab*) rtgui_realloc(notebook->childs, + sizeof(struct rtgui_notebook_tab) * notebook->count); + + notebook->childs[notebook->count - 1].title = rt_strdup(label); + notebook->childs[notebook->count - 1].widget = child; +} + +void rtgui_notebook_remove(rtgui_notebook_t* notebook, rt_uint16_t index) +{ + struct rtgui_notebook_tab tab; + RT_ASSERT(notebook != RT_NULL); + + if (index < notebook->count) + { + if (notebook->count == 1) + { + tab = notebook->childs[0]; + rtgui_free(notebook->childs); + notebook->childs = RT_NULL; + notebook->count = 0; + } + else + { + tab = notebook->childs[index]; + for (;index < notebook->count - 1; index ++) + { + notebook->childs[index] = notebook->childs[index + 1]; + } + + notebook->count -= 1; + notebook->childs = (struct rtgui_notebook_tab*) rtgui_realloc(notebook->childs, + sizeof(struct rtgui_notebook_tab) * notebook->count); + } + + rtgui_widget_destroy(tab.widget); + rtgui_free(tab.title); + + if (notebook->current == index) + { + /* update tab */ + if (notebook->current > notebook->count - 1) + notebook->current = notebook->count - 1; + rtgui_widget_update(RTGUI_WIDGET(notebook)); + } + } } -int rtgui_notebook_get_count(rtgui_notebootk_t* notebook) +int rtgui_notebook_get_count(rtgui_notebook_t* notebook) { return notebook->count; } @@ -26,7 +148,7 @@ rtgui_widget_t* rtgui_notebook_get_current(rtgui_notebook_t* notebook) { RT_ASSERT(notebook != RT_NULL); if (notebook->current != RTGUI_NOT_FOUND) - return ¬ebook->childs[notebook->current]; + return notebook->childs[notebook->current].widget; return RT_NULL; } @@ -38,7 +160,7 @@ void rtgui_notebook_set_current(rtgui_notebook_t* notebook, rtgui_widget_t* widg for (index = 0; index < notebook->count; index ++) { - if (widget == ¬ebook->childs[index]) + if (widget == notebook->childs[index].widget) { rtgui_notebook_set_current_by_index(notebook, index); return; @@ -53,11 +175,11 @@ void rtgui_notebook_set_current_by_index(rtgui_notebook_t* notebook, rt_uint16_t if ((index < notebook->count) && (notebook->current != index)) { if (notebook->current != RTGUI_NOT_FOUND) - rtgui_widget_hide(¬ebook->childs[notebook->current]); + rtgui_widget_hide(notebook->childs[notebook->current].widget); notebook->current = index; - rtgui_widget_show(¬ebook->childs[notebook->current]); - rtgui_widget_update(¬ebook->childs[notebook->current]); + rtgui_widget_show(notebook->childs[notebook->current].widget); + rtgui_widget_update(notebook->childs[notebook->current].widget); } } @@ -65,12 +187,22 @@ rtgui_widget_t* rtgui_notebook_get_index(rtgui_notebook_t* notebook, rt_uint16_t { RT_ASSERT(notebook != RT_NULL); if (index < notebook->count) - return ¬ebook->childs[index]; + return notebook->childs[index].widget; return RT_NULL; } rt_bool_t rtgui_notebook_event_handler(struct rtgui_widget* widget, struct rtgui_event* event) { + if (event->type == RTGUI_EVENT_PAINT) + { + _rtgui_notebook_ondraw(RTGUI_NOTEBOOK(widget)); + } + else + { + /* use parent event handler */ + return rtgui_widget_event_handler(widget, event); + } + return RT_FALSE; } diff --git a/components/rtgui/widgets/widget.c b/components/rtgui/widgets/widget.c index b3c5450444..7023065bfa 100644 --- a/components/rtgui/widgets/widget.c +++ b/components/rtgui/widgets/widget.c @@ -111,7 +111,7 @@ void rtgui_widget_destroy(rtgui_widget_t* widget) rtgui_object_destroy(RTGUI_OBJECT(widget)); } -void rtgui_widget_set_rect(rtgui_widget_t* widget, rtgui_rect_t* rect) +void rtgui_widget_set_rect(rtgui_widget_t* widget, const rtgui_rect_t* rect) { if (widget == RT_NULL || rect == RT_NULL) return; -- cgit v1.3.1