update menu control.

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

components/rtgui/include/rtgui/widgets/menu.h

@@ -1,9 +1,9 @@
 #ifndef __RTGUI_MENU_H__
 #define __RTGUI_MENU_H__
-:q
+
 #include <rtgui/image.h>
-#include <rtgui/widgets/label.h>
 #include <rtgui/widgets/window.h>
+#include <rtgui/widgets/listctrl.h>
 
 /* rtgui menu item */
 enum rtgui_menu_item_type
@@ -33,14 +33,6 @@ struct rtgui_menu_item
 };
 typedef struct rtgui_menu_item rtgui_menu_item_t;
 
-rtgui_menu_item_t items[] = 
-{
-	{RTGUI_ITEM_NORMAL, "item #1", RT_NULL, RT_NULL, 0, RT_NULL},
-	{RTGUI_ITEM_NORMAL, "item #2", RT_NULL, RT_NULL, 0, RT_NULL},
-	{RTGUI_ITEM_SEPARATOR, RT_NULL, RT_NULL, RT_NULL, 0, RT_NULL},
-	{RTGUI_ITEM_NORMAL, "item #3", RT_NULL, RT_NULL, 0, RT_NULL},
-};
-
 /** Gets the type of a menu */
 #define RTGUI_MENU_TYPE       (rtgui_menu_type_get())
 /** Casts the object to an rtgui_menu */
@@ -57,10 +49,11 @@ struct rtgui_menu
 	/* menu items */
 	const struct rtgui_menu_item *items;
 	rt_uint16_t items_count;
-	rt_uint16_t current_item;
 
 	/* parent menu */
 	struct rtgui_menu *parent_menu;
+	struct rtgui_menu *sub_menu;
+
 	/* menu item list control */
 	struct rtgui_listctrl *items_list;
 

components/rtgui/widgets/combobox.c

@@ -4,7 +4,6 @@
 
 static rt_bool_t rtgui_combobox_pulldown_hide(struct rtgui_widget* widget, struct rtgui_event* event);
 const static rt_uint8_t down_arrow[]  = {0xff, 0x7e, 0x3c, 0x18};
-const static rt_uint8_t right_arrow[] = {0x80, 0xc0, 0xe0, 0xf0, 0xe0, 0xc0, 0x80};
 
 static void _rtgui_combobox_constructor(rtgui_combobox_t *box)
 {

components/rtgui/widgets/menu.c

@@ -1,13 +1,13 @@
 #include <rtgui/dc.h>
-#include <rtgui/widgets/box.h>
 #include <rtgui/widgets/menu.h>
-#include <rtgui/widgets/window.h>
+#include <rtgui/rtgui_theme.h>
 
 #define RTGUI_MENU_IMAGE_MAGIN		18
 #define RTGUI_MENU_SUBMENU_MAGIN	16
 
 static void rtgui_menu_item_unselect(struct rtgui_menu_item* item);
 static rt_bool_t rtgui_menu_on_deactivate(rtgui_widget_t* widget, rtgui_event_t* event);
+const static rt_uint8_t right_arrow[] = {0x80, 0xc0, 0xe0, 0xf0, 0xe0, 0xc0, 0x80};
 
 static void _rtgui_menu_constructor(rtgui_menu_t *menu)
 {
@@ -19,9 +19,10 @@ static void _rtgui_menu_constructor(rtgui_menu_t *menu)
 
 	/* set proper of control */
 	menu->parent_menu = RT_NULL;
+	menu->sub_menu = RT_NULL;
+
 	menu->items = RT_NULL;
 	menu->items_count = 0; 
-	menu->current_item = 0;
 	menu->items_list = RT_NULL;
 
 	menu->on_menupop  = RT_NULL;
@@ -32,22 +33,62 @@ static void _rtgui_menu_destructor(rtgui_menu_t* menu)
 {
 }
 
+static void _rtgui_menu_onitem(struct rtgui_widget* widget, struct rtgui_event* event)
+{
+	struct rtgui_menu* menu;
+
+	/* get menu */
+	menu = RTGUI_MENU(rtgui_widget_get_toplevel(widget));
+	if (menu->items[menu->items_list->current_item].type == RTGUI_ITEM_SUBMENU)
+	{
+		const rtgui_menu_item_t* items;
+		rt_uint16_t count;
+
+		items = menu->items[menu->items_list->current_item].submenu;
+		count = menu->items[menu->items_list->current_item].submenu_count;
+		menu->sub_menu = rtgui_menu_create("submenu", menu, items, count);
+		rtgui_menu_pop(menu, 10, 10);
+	}
+	else /* other menu item */
+	{
+		rtgui_win_hiden(RTGUI_WIN(menu));
+	}
+}
+
 static void _rtgui_menu_item_ondraw(struct rtgui_listctrl *list, struct rtgui_dc* dc, rtgui_rect_t* rect, rt_uint16_t index)
 {
+	rtgui_rect_t item_rect;
 	struct rtgui_menu_item* item;
 
+	item_rect = *rect;
+	item_rect.x1 += 5;
+
+	/* re-fill item */
+	if (list->current_item == index)
+	{
+		rtgui_color_t bc;
+
+		bc = RTGUI_WIDGET_BACKGROUND(RTGUI_WIDGET(list));
+		RTGUI_WIDGET_BACKGROUND(RTGUI_WIDGET(list)) = blue;
+		rtgui_dc_fill_rect(dc, rect);
+		RTGUI_WIDGET_BACKGROUND(RTGUI_WIDGET(list)) = bc;
+	}
+
 	/* get menu item */
 	item = (rtgui_menu_item_t*)list->items;
 	item = &item[index];
 
 	if (item->type == RTGUI_ITEM_SUBMENU)
 	{
-		rtgui_dc_draw_text(dc, item->label, &rect);
-		rtgui_dc_draw_byte(dc, left_arraw, &rect);
+		rtgui_rect_t r = {0, 0, 8, 8};
+		rtgui_dc_draw_text(dc, item->label, &item_rect);
+		item_rect.x1 = item_rect.x2 - 16; item_rect.x2 -= 8;
+		rtgui_rect_moveto_align(&item_rect, &r, RTGUI_ALIGN_CENTER_HORIZONTAL | RTGUI_ALIGN_CENTER_VERTICAL);
+		rtgui_dc_draw_byte(dc, r.x1, r.y1, 8, right_arrow);
 	}
 	else if (item->type == RTGUI_ITEM_SEPARATOR)
 	{
-		rtgui_dc_draw_vline(dc, &rect);
+		rtgui_dc_draw_horizontal_line(dc, item_rect.x1, item_rect.x2, (item_rect.y2 + item_rect.y1)/2);
 	}
 	else if (item->type == RTGUI_ITEM_CHECK)
 	{
@@ -56,9 +97,9 @@ static void _rtgui_menu_item_ondraw(struct rtgui_listctrl *list, struct rtgui_dc
 	else
 	{
 		/* normal menu item */	
-		rtgui_dc_draw_text(dc, item->label, &rect);
+		rtgui_dc_draw_text(dc, item->label, &item_rect);
 		if (item->image != RT_NULL)
-			rtgui_image_blit(item->image, dc, &rect);
+			rtgui_image_blit(item->image, dc, &item_rect);
 	}
 }
 
@@ -86,14 +127,9 @@ static rt_bool_t rtgui_menu_on_deactivate(rtgui_widget_t* widget, rtgui_event_t*
 	rtgui_menu_t* menu = (rtgui_menu_t*) widget;
 
 	/* submenu is activate */
-	if (menu->items[menu->current_item].type == RTGUI_ITEM_SUBMEN)
+	if (menu->items[menu->items_list->current_item].type == RTGUI_ITEM_SUBMENU)
 	{
 		/* if sub menu activated, not hide menu */
-		if (menu->select_item->sub_menu != RT_NULL &&
-			rtgui_win_is_activated(RTGUI_WIN(menu->select_item->sub_menu)))
-		{
-			return RT_TRUE;
-		}
 	}
 
 	rtgui_win_hiden(RTGUI_WIN(menu));
@@ -106,7 +142,7 @@ static rt_bool_t rtgui_menu_on_deactivate(rtgui_widget_t* widget, rtgui_event_t*
 	if (menu->parent_menu != RT_NULL &&
 		!rtgui_win_is_activated(RTGUI_WIN(menu->parent_menu)))
 	{
-		rtgui_menu_on_deactivate(RTGUI_WIDGET(menu->parent_item->parent_menu), event);
+		rtgui_menu_on_deactivate(RTGUI_WIDGET(menu->parent_menu), event);
 	}
 
 	return RT_TRUE;
@@ -129,7 +165,10 @@ struct rtgui_menu* rtgui_menu_create(const char* title, struct rtgui_menu* paren
 		rtgui_widget_set_rect(RTGUI_WIDGET(menu), &rect);
 		rtgui_rect_inflate(&rect, -1);
 		/* create menu item list */
-		menu->items_list = rtgui_listctrl_create(items, count, &rect, _rtgui_menu_item_ondraw); 
+		menu->items_list = rtgui_listctrl_create((rt_uint32_t)items, count, &rect, _rtgui_menu_item_ondraw); 
+		RTGUI_WIDGET_BACKGROUND(RTGUI_WIDGET(menu->items_list)) = rtgui_theme_default_bc();
+		rtgui_container_add_child(RTGUI_CONTAINER(menu), RTGUI_WIDGET(menu->items_list));
+		rtgui_listctrl_set_onitem(menu->items_list, _rtgui_menu_onitem);
 	}
 
 	return menu;
@@ -157,16 +196,22 @@ void rtgui_menu_set_onmenuhide(struct rtgui_menu* menu, rtgui_event_handler_ptr
 void rtgui_menu_pop(struct rtgui_menu* menu, int x, int y)
 {
 	rtgui_rect_t rect;
-	rtgui_box_t* box;
+	struct rtgui_event_resize eresize;
 
 	if (menu == RT_NULL) return;
 
 	/* set window extent */
-	rect.x1 = x;
-	rect.y1 = y;
-	rect.x2 = x + menu->width;
-	rect.y2 = y + menu->height;
+	rect.x1 = 0; rect.y1 = 0;
+	rect.x2 = 100; rect.y2 = menu->items_count * (rtgui_theme_get_selected_height() + 2) + 5;
+	rtgui_rect_moveto(&rect, x, y);
 	rtgui_win_set_rect(RTGUI_WIN(menu), &rect);
+	rtgui_rect_inflate(&rect, -1);
+	rtgui_widget_set_rect(RTGUI_WIDGET(menu->items_list), &rect);
+
+	eresize.parent.type = RTGUI_EVENT_RESIZE;
+	eresize.x = rect.x1; eresize.y = rect.y1;
+	eresize.h = rect.y2 - rect.y1; eresize.w = rect.x2 - rect.x1;
+	rtgui_listctrl_event_handler(RTGUI_WIDGET(menu->items_list), &(eresize.parent));
 
 	/* on menu pop handler */
 	if (menu->on_menupop != RT_NULL)
@@ -177,4 +222,3 @@ void rtgui_menu_pop(struct rtgui_menu* menu, int x, int y)
 	/* show menu window */
 	rtgui_win_show(RTGUI_WIN(menu), RT_FALSE);
 }
-