summaryrefslogtreecommitdiff
path: root/rtgui/widgets
diff options
context:
space:
mode:
authorbernard.xiong <[email protected]>2010-04-05 23:05:13 +0000
committerbernard.xiong <[email protected]>2010-04-05 23:05:13 +0000
commit9372599ff99f68de3f4e6eee79661393774c4898 (patch)
tree824b161a8462e638d1f6c95745741ceb794bb0ef /rtgui/widgets
parent9f97b3404b6eea46643978f79284074db5d7e6e3 (diff)
support dc_buffer when small size is used; add freetype
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@579 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'rtgui/widgets')
-rw-r--r--rtgui/widgets/toplevel.c10
-rw-r--r--rtgui/widgets/widget.c6
2 files changed, 4 insertions, 12 deletions
diff --git a/rtgui/widgets/toplevel.c b/rtgui/widgets/toplevel.c
index 35284383ca..d700038082 100644
--- a/rtgui/widgets/toplevel.c
+++ b/rtgui/widgets/toplevel.c
@@ -141,12 +141,12 @@ void rtgui_toplevel_handle_clip(struct rtgui_toplevel* top,
info->num_rect);
top->external_clip_size = info->num_rect;
-#ifdef RTGUI_USING_SMALL_SIZE
- {
- extern void rtgui_topwin_get_clipinfo(struct rtgui_rect* list, rt_int32_t count);
+#ifdef RTGUI_USING_SMALL_SIZE
+ {
+ extern void rtgui_topwin_get_clipinfo(struct rtgui_rect* list, rt_int32_t count);
/* get rect list from topwin list */
- rtgui_topwin_get_clipinfo(top->external_clip_rect, top->external_clip_size);
+ rtgui_topwin_get_clipinfo(top->external_clip_rect, top->external_clip_size);
}
#else
/* copy rect array */
@@ -167,9 +167,7 @@ void rtgui_toplevel_update_clip(rtgui_toplevel_t* top)
/* reset toplevel widget clip to extent */
rtgui_region_reset(&(RTGUI_WIDGET(top)->clip), &(RTGUI_WIDGET(top)->extent));
-#ifndef RTGUI_USING_SMALL_SIZE
RTGUI_WIDGET(top)->clip_sync ++;
-#endif
/* subtract the screen rect */
screen_rect.x1 = screen_rect.y1 = 0;
diff --git a/rtgui/widgets/widget.c b/rtgui/widgets/widget.c
index 61043c81ec..e1826c1489 100644
--- a/rtgui/widgets/widget.c
+++ b/rtgui/widgets/widget.c
@@ -53,9 +53,7 @@ static void _rtgui_widget_constructor(rtgui_widget_t *widget)
/* does not set widget extent and only set clip_sync to zero */
rtgui_region_init(&(widget->clip));
-#ifndef RTGUI_USING_SMALL_SIZE
widget->clip_sync = 0;
-#endif
}
/* Destroys the widget */
@@ -73,9 +71,7 @@ static void _rtgui_widget_destructor(rtgui_widget_t *widget)
/* fini clip region */
rtgui_region_fini(&(widget->clip));
-#ifndef RTGUI_USING_SMALL_SIZE
widget->clip_sync = 0;
-#endif
}
rtgui_type_t *rtgui_widget_type_get(void)
@@ -415,10 +411,8 @@ void rtgui_widget_update_clip(rtgui_widget_t* widget)
/* if there is no parent, do not update clip (please use toplevel widget API) */
if (parent == RT_NULL) return;
-#ifndef RTGUI_USING_SMALL_SIZE
/* increase clip sync */
widget->clip_sync ++;
-#endif
/* reset clip to extent */
rtgui_region_reset(&(widget->clip), &(widget->extent));