Просмотр исходного кода

rtgui/widgets/notebook: get rect only when needed

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1815 bbd45198-f89e-11dd-88c7-29a3b14d5316
chaos.proton@gmail.com 13 лет назад
Родитель
Сommit
b38a97572c
1 измененных файлов с 3 добавлено и 4 удалено
  1. 3 4
      components/rtgui/widgets/notebook.c

+ 3 - 4
components/rtgui/widgets/notebook.c

@@ -69,15 +69,14 @@ static void _rtgui_notebook_draw_bar(struct rtgui_notebook *notebook,
 static void _rtgui_notebook_ondraw(rtgui_notebook_t *notebook)
 static void _rtgui_notebook_ondraw(rtgui_notebook_t *notebook)
 {
 {
 	struct rtgui_dc* dc;
 	struct rtgui_dc* dc;
-	rtgui_rect_t rect;
 
 
 	dc = rtgui_dc_begin_drawing(RTGUI_WIDGET(notebook));
 	dc = rtgui_dc_begin_drawing(RTGUI_WIDGET(notebook));
 	if (dc == RT_NULL) return;
 	if (dc == RT_NULL) return;
 
 
-	rtgui_widget_get_rect(RTGUI_WIDGET(notebook), &rect);
-
 	if (notebook->count == 0)
 	if (notebook->count == 0)
 	{
 	{
+		rtgui_rect_t rect;
+		rtgui_widget_get_rect(RTGUI_WIDGET(notebook), &rect);
 		rtgui_dc_fill_rect(dc, &rect);
 		rtgui_dc_fill_rect(dc, &rect);
 	}
 	}
 	else
 	else
@@ -124,7 +123,7 @@ static void _rtgui_notebook_onmouse(rtgui_notebook_t *notebook, struct rtgui_eve
 
 
 	/* handle on page */
 	/* handle on page */
 	if (notebook->childs[notebook->current].widget->event_handler != RT_NULL)
 	if (notebook->childs[notebook->current].widget->event_handler != RT_NULL)
-		notebook->childs[notebook->current].widget->event_handler(notebook->childs[notebook->current].widget, 
+		notebook->childs[notebook->current].widget->event_handler(notebook->childs[notebook->current].widget,
 			&(emouse->parent));
 			&(emouse->parent));
 }
 }