diff --git a/examples/gui/demo_view_benchmark.c b/examples/gui/demo_view_benchmark.c index a023ed0bbd..e86046d142 100644 --- a/examples/gui/demo_view_benchmark.c +++ b/examples/gui/demo_view_benchmark.c @@ -1,32 +1,35 @@ #include +#include #include #include #include "demo_view.h" -#define RAND(x1, x2) (rand() % ((x2 - x1) + x1)) +#define RAND(x1, x2) ((rand() % (x2 - x1)) + x1) +static rtgui_view_t* view = RT_NULL; void _onidle(rtgui_widget_t* widget, rtgui_event_t *event) { rtgui_color_t color; rtgui_rect_t rect, draw_rect; + struct rtgui_dc *dc; - /* 获得控件所属的DC */ - dc = rtgui_dc_begin_drawing(widget); + /* ÿؼDC */ + // dc = rtgui_dc_hw_create(RTGUI_WIDGET(view)); + dc = rtgui_dc_begin_drawing(RTGUI_WIDGET(view)); if (dc == RT_NULL) return ; - demo_view_get_rect(RTGUI_VIEW(widget), &rect); + demo_view_get_rect(RTGUI_VIEW(view), &rect); draw_rect.x1 = RAND(rect.x1, rect.x2); draw_rect.y1 = RAND(rect.y1, rect.y2); draw_rect.x2 = RAND(draw_rect.x1, rect.x2); draw_rect.y2 = RAND(draw_rect.y1, rect.y2); - RTGUI_RGB_R(color) = rand() % 255; - RTGUI_RGB_G(color) = rand() % 255; - RTGUI_RGB_B(color) = rand() % 255; + color = RTGUI_RGB(rand() % 255, rand() % 255, rand() % 255); + RTGUI_WIDGET_BACKGROUND(RTGUI_WIDGET(view)) = color; - rtgui_dc_fill_rect(dc, &rect); + rtgui_dc_fill_rect(dc, &draw_rect); - /* 绘图完成 */ + /* ͼ */ rtgui_dc_end_drawing(dc); } @@ -37,26 +40,26 @@ rt_bool_t benchmark_event_handler(rtgui_widget_t* widget, rtgui_event_t *event) struct rtgui_dc* dc; rtgui_rect_t rect; - /* 因为用的是demo view,上面本身有一部分控件,所以在绘图时先要让demo view先绘图 */ + /* Ϊõdemo view汾һֿؼڻͼʱҪdemo viewȻͼ */ rtgui_view_event_handler(widget, event); - /* 获得控件所属的DC */ + /* ÿؼDC */ dc = rtgui_dc_begin_drawing(widget); - if (dc == RT_NULL) /* 如果不能正常获得DC,返回(如果控件或父控件是隐藏状态,DC是获取不成功的) */ + if (dc == RT_NULL) /* DCأؼ򸸿ؼ״̬DCǻȡɹģ */ return RT_FALSE; - /* 获得demo view允许绘图的区域 */ + /* demo viewͼ */ demo_view_get_rect(RTGUI_VIEW(widget), &rect); - /* 擦除所有 */ + /* */ rtgui_dc_fill_rect(dc, &rect); - /* 绘图完成 */ + /* ͼ */ rtgui_dc_end_drawing(dc); } else { - /* 调用默认的事件处理函数 */ + /* Ĭϵ¼ */ return rtgui_view_event_handler(widget, event); } @@ -65,12 +68,11 @@ rt_bool_t benchmark_event_handler(rtgui_widget_t* widget, rtgui_event_t *event) rtgui_view_t *demo_view_benchmark(rtgui_workbench_t* workbench) { - rtgui_view_t *view; + // rtgui_view_t *view; srand(100); - view = demo_view(workbench, "绘图测试"); - if (view != RT_NULL) - rtgui_widget_set_event_handler(RTGUI_WIDGET(view), benchmark_event_handler); + view = demo_view(workbench, "ͼ"); + rtgui_widget_set_event_handler(RTGUI_WIDGET(view), benchmark_event_handler); rtgui_thread_set_onidle(_onidle);