From 41c6c37bc7540055ba590eaab8e86a26523888c2 Mon Sep 17 00:00:00 2001 From: "chaos.proton@gmail.com" Date: Mon, 28 Nov 2011 06:47:15 +0000 Subject: [PATCH] rtgui/widgets/notebook.c: use RTGUI_NOTEBOOK_TAB_WIDTH instead of magic number git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1812 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/rtgui/widgets/notebook.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/components/rtgui/widgets/notebook.c b/components/rtgui/widgets/notebook.c index 943aa4a4b0..60f051390d 100644 --- a/components/rtgui/widgets/notebook.c +++ b/components/rtgui/widgets/notebook.c @@ -3,6 +3,8 @@ #include #include +#define RTGUI_NOTEBOOK_TAB_WIDTH 80 + static void _rtgui_notebook_get_bar_rect(rtgui_notebook_t *notebook, struct rtgui_rect* rect); static void _rtgui_notebook_get_page_rect(rtgui_notebook_t *notebook, struct rtgui_rect* rect); @@ -55,7 +57,7 @@ static void _rtgui_notebook_ondraw(rtgui_notebook_t *notebook) _rtgui_notebook_get_bar_rect(notebook, &rect); rtgui_dc_fill_rect(dc, &rect); - rect.x2 = rect.x1 + 80; + rect.x2 = rect.x1 + RTGUI_NOTEBOOK_TAB_WIDTH; /* draw tab bar */ for (index = 0; index < notebook->count; index ++) { @@ -63,8 +65,10 @@ static void _rtgui_notebook_ondraw(rtgui_notebook_t *notebook) rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_SUNKEN); else rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_BOX); + rtgui_dc_draw_text(dc, notebook->childs[index].title, &rect); - rect.x1 += 80; rect.x2 += 80; + rect.x1 += RTGUI_NOTEBOOK_TAB_WIDTH; + rect.x2 += RTGUI_NOTEBOOK_TAB_WIDTH; } /* draw current tab */ @@ -85,7 +89,7 @@ static void _rtgui_notebook_onmouse(rtgui_notebook_t *notebook, struct rtgui_eve int index; struct rtgui_dc* dc; - index = (emouse->x - rect.x1) / 80; + index = (emouse->x - rect.x1) / RTGUI_NOTEBOOK_TAB_WIDTH; if (index < notebook->count) { /* update tab bar */ @@ -96,7 +100,7 @@ static void _rtgui_notebook_onmouse(rtgui_notebook_t *notebook, struct rtgui_eve _rtgui_notebook_get_bar_rect(notebook, &rect); rtgui_dc_fill_rect(dc, &rect); - rect.x2 = rect.x1 + 80; + rect.x2 = rect.x1 + RTGUI_NOTEBOOK_TAB_WIDTH; /* draw tab bar */ for (index = 0; index < notebook->count; index ++) { @@ -105,7 +109,8 @@ static void _rtgui_notebook_onmouse(rtgui_notebook_t *notebook, struct rtgui_eve else rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_BOX); rtgui_dc_draw_text(dc, notebook->childs[index].title, &rect); - rect.x1 += 80; rect.x2 += 80; + rect.x1 += RTGUI_NOTEBOOK_TAB_WIDTH; + rect.x2 += RTGUI_NOTEBOOK_TAB_WIDTH; } rtgui_dc_end_drawing(dc);