change window close button outlook and add select bar drawing.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@355 bbd45198-f89e-11dd-88c7-29a3b14d5316

2 files changed, 118 insertions, 1 deletions

diff --git a/examples/gui/demo_fnview.c b/examples/gui/demo_fnview.c
index f7d4010597..68c4269137 100644
--- a/examples/gui/demo_fnview.c
+++ b/examples/gui/demo_fnview.c
@@ -14,7 +14,11 @@ static void open_btn_onbutton(rtgui_widget_t* widget, struct rtgui_event* event)
 	workbench = RTGUI_WORKBENCH(rtgui_widget_get_toplevel(widget));

 	rtgui_widget_get_rect(RTGUI_WIDGET(workbench), &rect);

 

+#ifdef _WIN32

+	view = rtgui_filelist_view_create(workbench, "d:\\", "*.*", &rect);

+#else

 	view = rtgui_filelist_view_create(workbench, "/", "*.*", &rect);

+#endif

 	if (rtgui_view_show(RTGUI_VIEW(view), RT_TRUE) == RTGUI_MODAL_OK)

 	{

 		char path[32];

diff --git a/examples/gui/demo_view_dc.c b/examples/gui/demo_view_dc.c
index be0abdd1da..8a5f54b5b1 100644
--- a/examples/gui/demo_view_dc.c
+++ b/examples/gui/demo_view_dc.c
@@ -3,6 +3,28 @@
 #include <rtgui/widgets/label.h>

 #include <rtgui/widgets/slider.h>

 

+static const rt_uint8_t boxChecked[7] = {0x02, 0x06, 0x8E, 0xDC, 0xF8, 0x70, 0x20};

+

+static const rt_uint8_t  sysMin[2] = {0x7E, 0x7E};

+static const rt_uint8_t  sysMax[18] = {0x0F, 0xF8, 0x0F, 0xF8, 0x08, 0x08,

+	0x08, 0x08, 0x08, 0x08, 0x08, 0x08,

+	0x08, 0x08, 0x08, 0x08, 0x0F, 0xF8

+};

+static const rt_uint8_t  sysNormal[18] = {0x03, 0xF0, 0x03, 0xF0, 0x02, 0x10,

+	0x0F, 0xD0, 0x0F, 0xD0, 0x08, 0x70,

+	0x08, 0x40, 0x08, 0x40, 0x0F, 0xC0

+};

+

+static const rt_uint8_t  sysClose[14] = {0x06, 0x18, 0x03, 0x30, 0x01, 0xE0, 0x00,

+	0xC0, 0x01, 0xE0, 0x03, 0x30, 0x06, 0x18

+};

+

+static const rt_uint8_t  viewSYS[28] = {0xFF, 0x1F, 0x3C, 0x06, 0x1C, 0x04, 0x1C,

+	0x0C, 0x0E, 0x08, 0x0E, 0x18, 0x07, 0x10,

+	0x07, 0x30, 0x03, 0xA0, 0x03, 0xE0, 0x01,

+	0xC0, 0x01, 0xC0, 0x00, 0x80, 0x00, 0x80

+};

+

 rt_bool_t dc_event_handler(rtgui_widget_t* widget, rtgui_event_t *event)

 {

 	if (event->type == RTGUI_EVENT_PAINT)

@@ -35,7 +57,7 @@ rt_bool_t dc_event_handler(rtgui_widget_t* widget, rtgui_event_t *event)
 		rtgui_dc_set_color(dc, green);

 		rtgui_dc_fill_circle(dc, rect.x1 + 30, rect.y1 + 10, 10);

 

-		/* ��һ��Բ�� */ 

+		/* ��һ��Բ�� */

 		rtgui_dc_set_color(dc, RTGUI_RGB(250, 120, 120));

 		rtgui_dc_draw_arc(dc, rect.x1 + 120, rect.y1 + 60, 30, 0, 120);

 

@@ -43,6 +65,97 @@ rt_bool_t dc_event_handler(rtgui_widget_t* widget, rtgui_event_t *event)
 		rtgui_dc_set_color(dc, blue);

 		rtgui_dc_draw_polygon(dc, vx, vy, 6);

 

+		{

+			rtgui_rect_t item_rect = {0, 0, 14, 14};

+			rt_uint16_t item_size = 14;

+

+			rtgui_rect_moveto(&item_rect, 100, 100);

+

+			rtgui_dc_set_color(dc, RTGUI_RGB(0x66, 0x66, 0x66));
+			rtgui_dc_draw_circle(dc, item_rect.x1 + item_size/2, item_rect.y1 + item_size/2, item_size/2);
+			rtgui_dc_set_color(dc, RTGUI_RGB(0xff, 0xFF, 0xFF));
+			rtgui_dc_draw_circle(dc, item_rect.x1 + item_size/2, item_rect.y1 + item_size/2, item_size/2 - 1);
+
+			rtgui_dc_set_color(dc, RTGUI_RGB(0x00, 0x00, 0x00));
+			rtgui_dc_fill_circle(dc, item_rect.x1 + item_size/2, item_rect.y1 + item_size/2, item_size/2 - 3);
+		}
+
+		{
+			rtgui_rect_t item_rect = {0, 0, 14, 14};

+			rt_uint16_t item_size = 14;

+			rtgui_rect_moveto(&item_rect, 120, 120);

+
+			rtgui_dc_set_color(dc, RTGUI_RGB(0x66, 0x66, 0x66));
+			rtgui_dc_draw_circle(dc, item_rect.x1 + item_size/2, item_rect.y1 + item_size/2, item_size/2);
+			rtgui_dc_set_color(dc, RTGUI_RGB(0xff, 0xFF, 0xFF));
+			rtgui_dc_draw_circle(dc, item_rect.x1 + item_size/2, item_rect.y1 + item_size/2, item_size/2 - 1);
+			rtgui_dc_set_color(dc, RTGUI_RGB(0x00, 0x00, 0x00));
+		}
+		{

+			int x, y;

+
+			x = 150; y = 150;
+			rtgui_dc_set_color(dc, black);
+
+			rtgui_dc_draw_byte(dc, x, y, 7, boxChecked);
+			y += 7 + 2;
+
+			rtgui_dc_draw_byte(dc, x, y, 2, sysMin);
+			y += 2 + 2;
+
+			rtgui_dc_draw_word(dc, x, y, 9, sysMax);
+			y += 9 + 2;
+
+			rtgui_dc_draw_word(dc, x, y, 9, sysNormal);
+			y += 9 + 2;
+
+			rtgui_dc_draw_word(dc, x, y, 7, sysClose);
+			y += 7 + 2;
+
+			rtgui_dc_draw_word(dc, x, y, 14, viewSYS);
+			y += 14 + 2;
+		}
+

+		{

+			rtgui_rect_t rect = {0, 0, 16, 16};

+			rtgui_rect_moveto(&rect, 30, 120);

+

+			rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_RAISE); 

+			rect.x1 += 20; rect.x2 += 20 + 50;

+			rtgui_dc_draw_text(dc, "raise", &rect);

+			rect.x1 -= 20; rect.x2 -= 20 + 50;

+			rect.y1 += 20; rect.y2 += 20;

+

+			rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_SIMPLE);

+			rect.x1 += 20; rect.x2 += 20 + 50;

+			rtgui_dc_draw_text(dc, "simple", &rect);

+			rect.x1 -= 20; rect.x2 -= 20 + 50;

+			rect.y1 += 20; rect.y2 += 20;

+

+			rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_SUNKEN);

+			rect.x1 += 20; rect.x2 += 20 + 50;

+			rtgui_dc_draw_text(dc, "sunken", &rect);

+			rect.x1 -= 20; rect.x2 -= 20 + 50;

+			rect.y1 += 20; rect.y2 += 20;

+

+			rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_BOX);

+			rect.x1 += 20; rect.x2 += 20 + 50;

+			rtgui_dc_draw_text(dc, "box", &rect);

+			rect.x1 -= 20; rect.x2 -= 20 + 50;

+			rect.y1 += 20; rect.y2 += 20;

+

+			rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_STATIC);

+			rect.x1 += 20; rect.x2 += 20 + 50;

+			rtgui_dc_draw_text(dc, "static", &rect);

+			rect.x1 -= 20; rect.x2 -= 20 + 50;

+			rect.y1 += 20; rect.y2 += 20;

+

+			rtgui_dc_draw_border(dc, &rect, RTGUI_BORDER_EXTRA);

+			rect.x1 += 20; rect.x2 += 20 + 50;

+			rtgui_dc_draw_text(dc, "extra", &rect);

+			rect.x1 -= 20; rect.x2 -= 20 + 50;

+			rect.y1 += 20; rect.y2 += 20;

+		}

 		/* ��ͼ��� */

 		rtgui_dc_end_drawing(dc);

 	}