mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2025-12-26 01:07:21 +00:00
sync RTGUI with github(https://github.com/RT-Thread/RTGUI) 9ae08379da5b698d6facc40bd0415de2e254ae9c
As always, full log is in GitHub. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2449 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
dzzxzz@gmail.com
@@ -20,47 +20,47 @@
|
||||
|
||||
static void _rtgui_container_constructor(rtgui_container_t *container)
|
||||
{
|
||||
/* init container */
|
||||
rtgui_object_set_event_handler(RTGUI_OBJECT(container),
|
||||
rtgui_container_event_handler);
|
||||
/* init container */
|
||||
rtgui_object_set_event_handler(RTGUI_OBJECT(container),
|
||||
rtgui_container_event_handler);
|
||||
|
||||
rtgui_list_init(&(container->children));
|
||||
container->layout_box = RT_NULL;
|
||||
rtgui_list_init(&(container->children));
|
||||
container->layout_box = RT_NULL;
|
||||
|
||||
RTGUI_WIDGET(container)->flag |= RTGUI_WIDGET_FLAG_FOCUSABLE;
|
||||
RTGUI_WIDGET(container)->flag |= RTGUI_WIDGET_FLAG_FOCUSABLE;
|
||||
}
|
||||
|
||||
static void _rtgui_container_destructor(rtgui_container_t *container)
|
||||
{
|
||||
rtgui_container_destroy_children(container);
|
||||
rtgui_container_destroy_children(container);
|
||||
|
||||
if (container->layout_box != RT_NULL)
|
||||
rtgui_object_destroy(RTGUI_OBJECT(container->layout_box));
|
||||
if (container->layout_box != RT_NULL)
|
||||
rtgui_object_destroy(RTGUI_OBJECT(container->layout_box));
|
||||
}
|
||||
|
||||
DEFINE_CLASS_TYPE(container, "container",
|
||||
RTGUI_WIDGET_TYPE,
|
||||
_rtgui_container_constructor,
|
||||
_rtgui_container_destructor,
|
||||
sizeof(struct rtgui_container));
|
||||
RTGUI_WIDGET_TYPE,
|
||||
_rtgui_container_constructor,
|
||||
_rtgui_container_destructor,
|
||||
sizeof(struct rtgui_container));
|
||||
RTM_EXPORT(_rtgui_container);
|
||||
|
||||
rt_bool_t rtgui_container_dispatch_event(rtgui_container_t *container, rtgui_event_t* event)
|
||||
rt_bool_t rtgui_container_dispatch_event(rtgui_container_t *container, rtgui_event_t *event)
|
||||
{
|
||||
/* handle in child widget */
|
||||
struct rtgui_list_node* node;
|
||||
/* handle in child widget */
|
||||
struct rtgui_list_node *node;
|
||||
|
||||
rtgui_list_foreach(node, &(container->children))
|
||||
{
|
||||
struct rtgui_widget* w;
|
||||
w = rtgui_list_entry(node, struct rtgui_widget, sibling);
|
||||
rtgui_list_foreach(node, &(container->children))
|
||||
{
|
||||
struct rtgui_widget *w;
|
||||
w = rtgui_list_entry(node, struct rtgui_widget, sibling);
|
||||
|
||||
if (RTGUI_OBJECT(w)->event_handler &&
|
||||
RTGUI_OBJECT(w)->event_handler(RTGUI_OBJECT(w), event) == RT_TRUE)
|
||||
return RT_TRUE;
|
||||
}
|
||||
if (RTGUI_OBJECT(w)->event_handler &&
|
||||
RTGUI_OBJECT(w)->event_handler(RTGUI_OBJECT(w), event) == RT_TRUE)
|
||||
return RT_TRUE;
|
||||
}
|
||||
|
||||
return RT_FALSE;
|
||||
return RT_FALSE;
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_dispatch_event);
|
||||
|
||||
@@ -68,133 +68,137 @@ RTM_EXPORT(rtgui_container_dispatch_event);
|
||||
* events will always reach every child.*/
|
||||
rt_bool_t rtgui_container_broadcast_event(struct rtgui_container *container, struct rtgui_event *event)
|
||||
{
|
||||
struct rtgui_list_node* node;
|
||||
struct rtgui_list_node *node;
|
||||
|
||||
rtgui_list_foreach(node, &(container->children))
|
||||
{
|
||||
struct rtgui_widget* w;
|
||||
w = rtgui_list_entry(node, struct rtgui_widget, sibling);
|
||||
rtgui_list_foreach(node, &(container->children))
|
||||
{
|
||||
struct rtgui_widget *w;
|
||||
w = rtgui_list_entry(node, struct rtgui_widget, sibling);
|
||||
|
||||
if (RTGUI_OBJECT(w)->event_handler)
|
||||
RTGUI_OBJECT(w)->event_handler(RTGUI_OBJECT(w), event);
|
||||
}
|
||||
if (RTGUI_OBJECT(w)->event_handler)
|
||||
RTGUI_OBJECT(w)->event_handler(RTGUI_OBJECT(w), event);
|
||||
}
|
||||
|
||||
return RT_FALSE;
|
||||
return RT_FALSE;
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_broadcast_event);
|
||||
|
||||
rt_bool_t rtgui_container_dispatch_mouse_event(rtgui_container_t *container, struct rtgui_event_mouse* event)
|
||||
rt_bool_t rtgui_container_dispatch_mouse_event(rtgui_container_t *container, struct rtgui_event_mouse *event)
|
||||
{
|
||||
/* handle in child widget */
|
||||
struct rtgui_list_node* node;
|
||||
struct rtgui_widget *old_focus;
|
||||
/* handle in child widget */
|
||||
struct rtgui_list_node *node;
|
||||
struct rtgui_widget *old_focus;
|
||||
|
||||
old_focus = RTGUI_WIDGET(container)->toplevel->focused_widget;
|
||||
old_focus = RTGUI_WIDGET(container)->toplevel->focused_widget;
|
||||
|
||||
rtgui_list_foreach(node, &(container->children))
|
||||
{
|
||||
struct rtgui_widget* w;
|
||||
w = rtgui_list_entry(node, struct rtgui_widget, sibling);
|
||||
if (rtgui_rect_contains_point(&(w->extent),
|
||||
event->x, event->y) == RT_EOK)
|
||||
{
|
||||
if ((old_focus != w) && RTGUI_WIDGET_IS_FOCUSABLE(w))
|
||||
rtgui_widget_focus(w);
|
||||
if (RTGUI_OBJECT(w)->event_handler &&
|
||||
RTGUI_OBJECT(w)->event_handler(RTGUI_OBJECT(w),
|
||||
(rtgui_event_t*)event) == RT_TRUE)
|
||||
return RT_TRUE;
|
||||
}
|
||||
}
|
||||
rtgui_list_foreach(node, &(container->children))
|
||||
{
|
||||
struct rtgui_widget *w;
|
||||
w = rtgui_list_entry(node, struct rtgui_widget, sibling);
|
||||
if (rtgui_rect_contains_point(&(w->extent),
|
||||
event->x, event->y) == RT_EOK)
|
||||
{
|
||||
if ((old_focus != w) && RTGUI_WIDGET_IS_FOCUSABLE(w))
|
||||
rtgui_widget_focus(w);
|
||||
if (RTGUI_OBJECT(w)->event_handler &&
|
||||
RTGUI_OBJECT(w)->event_handler(RTGUI_OBJECT(w),
|
||||
(rtgui_event_t *)event) == RT_TRUE)
|
||||
return RT_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return RT_FALSE;
|
||||
return RT_FALSE;
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_dispatch_mouse_event);
|
||||
|
||||
rt_bool_t rtgui_container_event_handler(struct rtgui_object* object, struct rtgui_event* event)
|
||||
rt_bool_t rtgui_container_event_handler(struct rtgui_object *object, struct rtgui_event *event)
|
||||
{
|
||||
struct rtgui_container *container;
|
||||
struct rtgui_widget *widget;
|
||||
struct rtgui_container *container;
|
||||
struct rtgui_widget *widget;
|
||||
|
||||
RT_ASSERT(object != RT_NULL);
|
||||
RT_ASSERT(event != RT_NULL);
|
||||
RT_ASSERT(object != RT_NULL);
|
||||
RT_ASSERT(event != RT_NULL);
|
||||
|
||||
container = RTGUI_CONTAINER(object);
|
||||
widget = RTGUI_WIDGET(object);
|
||||
container = RTGUI_CONTAINER(object);
|
||||
widget = RTGUI_WIDGET(object);
|
||||
|
||||
switch (event->type)
|
||||
{
|
||||
case RTGUI_EVENT_PAINT:
|
||||
{
|
||||
struct rtgui_dc* dc;
|
||||
struct rtgui_rect rect;
|
||||
switch (event->type)
|
||||
{
|
||||
case RTGUI_EVENT_PAINT:
|
||||
{
|
||||
struct rtgui_dc *dc;
|
||||
struct rtgui_rect rect;
|
||||
|
||||
dc = rtgui_dc_begin_drawing(widget);
|
||||
if (dc == RT_NULL)
|
||||
return RT_FALSE;
|
||||
rtgui_widget_get_rect(widget, &rect);
|
||||
dc = rtgui_dc_begin_drawing(widget);
|
||||
if (dc == RT_NULL)
|
||||
return RT_FALSE;
|
||||
rtgui_widget_get_rect(widget, &rect);
|
||||
|
||||
/* fill container with background */
|
||||
rtgui_dc_fill_rect(dc, &rect);
|
||||
/* fill container with background */
|
||||
rtgui_dc_fill_rect(dc, &rect);
|
||||
|
||||
/* paint on each child */
|
||||
rtgui_container_dispatch_event(container, event);
|
||||
/* paint on each child */
|
||||
rtgui_container_dispatch_event(container, event);
|
||||
|
||||
rtgui_dc_end_drawing(dc);
|
||||
}
|
||||
break;
|
||||
rtgui_dc_end_drawing(dc);
|
||||
}
|
||||
break;
|
||||
|
||||
case RTGUI_EVENT_KBD:
|
||||
break;
|
||||
case RTGUI_EVENT_KBD:
|
||||
break;
|
||||
|
||||
case RTGUI_EVENT_MOUSE_BUTTON:
|
||||
case RTGUI_EVENT_MOUSE_MOTION:
|
||||
/* handle in child widget */
|
||||
return rtgui_container_dispatch_mouse_event(container,
|
||||
(struct rtgui_event_mouse*)event);
|
||||
case RTGUI_EVENT_MOUSE_BUTTON:
|
||||
case RTGUI_EVENT_MOUSE_MOTION:
|
||||
/* handle in child widget */
|
||||
return rtgui_container_dispatch_mouse_event(container,
|
||||
(struct rtgui_event_mouse *)event);
|
||||
|
||||
case RTGUI_EVENT_SHOW:
|
||||
rtgui_widget_onshow(RTGUI_OBJECT(container), event);
|
||||
rtgui_container_dispatch_event(container, event);
|
||||
break;
|
||||
case RTGUI_EVENT_HIDE:
|
||||
rtgui_widget_onhide(RTGUI_OBJECT(container), event);
|
||||
rtgui_container_dispatch_event(container, event);
|
||||
break;
|
||||
case RTGUI_EVENT_COMMAND:
|
||||
case RTGUI_EVENT_RESIZE:
|
||||
rtgui_container_dispatch_event(container, event);
|
||||
break;
|
||||
case RTGUI_EVENT_SHOW:
|
||||
rtgui_widget_onshow(RTGUI_OBJECT(container), event);
|
||||
rtgui_container_dispatch_event(container, event);
|
||||
break;
|
||||
case RTGUI_EVENT_HIDE:
|
||||
rtgui_widget_onhide(RTGUI_OBJECT(container), event);
|
||||
rtgui_container_dispatch_event(container, event);
|
||||
break;
|
||||
case RTGUI_EVENT_COMMAND:
|
||||
rtgui_container_dispatch_event(container, event);
|
||||
break;
|
||||
|
||||
case RTGUI_EVENT_UPDATE_TOPLVL:
|
||||
/* call parent handler */
|
||||
rtgui_widget_onupdate_toplvl(object, event);
|
||||
/* update the children */
|
||||
rtgui_container_broadcast_event(container, event);
|
||||
break;
|
||||
case RTGUI_EVENT_UPDATE_TOPLVL:
|
||||
/* call parent handler */
|
||||
rtgui_widget_onupdate_toplvl(object, event);
|
||||
/* update the children */
|
||||
rtgui_container_broadcast_event(container, event);
|
||||
break;
|
||||
|
||||
default:
|
||||
/* call parent widget event handler */
|
||||
return rtgui_widget_event_handler(RTGUI_OBJECT(widget), event);
|
||||
}
|
||||
case RTGUI_EVENT_RESIZE:
|
||||
/* re-layout container */
|
||||
rtgui_container_layout(container);
|
||||
break;
|
||||
|
||||
return RT_FALSE;
|
||||
default:
|
||||
/* call parent widget event handler */
|
||||
return rtgui_widget_event_handler(RTGUI_OBJECT(widget), event);
|
||||
}
|
||||
|
||||
return RT_FALSE;
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_event_handler);
|
||||
|
||||
rtgui_container_t* rtgui_container_create(void)
|
||||
rtgui_container_t *rtgui_container_create(void)
|
||||
{
|
||||
struct rtgui_container* container;
|
||||
struct rtgui_container *container;
|
||||
|
||||
/* allocate container */
|
||||
container = (struct rtgui_container*) rtgui_widget_create (RTGUI_CONTAINER_TYPE);
|
||||
return container;
|
||||
/* allocate container */
|
||||
container = (struct rtgui_container *) rtgui_widget_create(RTGUI_CONTAINER_TYPE);
|
||||
return container;
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_create);
|
||||
|
||||
void rtgui_container_destroy(rtgui_container_t* container)
|
||||
void rtgui_container_destroy(rtgui_container_t *container)
|
||||
{
|
||||
rtgui_widget_destroy(RTGUI_WIDGET(container));
|
||||
rtgui_widget_destroy(RTGUI_WIDGET(container));
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_destroy);
|
||||
|
||||
@@ -203,117 +207,117 @@ RTM_EXPORT(rtgui_container_destroy);
|
||||
* Note: this function will not change the widget layout
|
||||
* the layout is the responsibility of layout widget, such as box.
|
||||
*/
|
||||
void rtgui_container_add_child(rtgui_container_t *container, rtgui_widget_t* child)
|
||||
void rtgui_container_add_child(rtgui_container_t *container, rtgui_widget_t *child)
|
||||
{
|
||||
RT_ASSERT(container != RT_NULL);
|
||||
RT_ASSERT(child != RT_NULL);
|
||||
RT_ASSERT(container != RT_NULL);
|
||||
RT_ASSERT(child != RT_NULL);
|
||||
|
||||
/* set parent and toplevel widget */
|
||||
child->parent = RTGUI_WIDGET(container);
|
||||
/* put widget to parent's children list */
|
||||
rtgui_list_append(&(container->children), &(child->sibling));
|
||||
/* set parent and toplevel widget */
|
||||
child->parent = RTGUI_WIDGET(container);
|
||||
/* put widget to parent's children list */
|
||||
rtgui_list_append(&(container->children), &(child->sibling));
|
||||
|
||||
/* update children toplevel */
|
||||
if (RTGUI_WIDGET(container)->toplevel != RT_NULL &&
|
||||
RTGUI_IS_WIN(RTGUI_WIDGET(container)->toplevel))
|
||||
{
|
||||
struct rtgui_event_update_toplvl eup;
|
||||
RTGUI_EVENT_UPDATE_TOPLVL_INIT(&eup);
|
||||
eup.toplvl = RTGUI_WIDGET(container)->toplevel;
|
||||
rtgui_container_broadcast_event(container, (struct rtgui_event*)&eup);
|
||||
}
|
||||
/* update children toplevel */
|
||||
if (RTGUI_WIDGET(container)->toplevel != RT_NULL &&
|
||||
RTGUI_IS_WIN(RTGUI_WIDGET(container)->toplevel))
|
||||
{
|
||||
struct rtgui_event_update_toplvl eup;
|
||||
RTGUI_EVENT_UPDATE_TOPLVL_INIT(&eup);
|
||||
eup.toplvl = RTGUI_WIDGET(container)->toplevel;
|
||||
rtgui_container_broadcast_event(container, (struct rtgui_event *)&eup);
|
||||
}
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_add_child);
|
||||
|
||||
/* remove a child to widget */
|
||||
void rtgui_container_remove_child(rtgui_container_t *container, rtgui_widget_t* child)
|
||||
void rtgui_container_remove_child(rtgui_container_t *container, rtgui_widget_t *child)
|
||||
{
|
||||
RT_ASSERT(container != RT_NULL);
|
||||
RT_ASSERT(child != RT_NULL);
|
||||
RT_ASSERT(container != RT_NULL);
|
||||
RT_ASSERT(child != RT_NULL);
|
||||
|
||||
rtgui_widget_unfocus(child);
|
||||
rtgui_widget_unfocus(child);
|
||||
|
||||
/* remove widget from parent's children list */
|
||||
rtgui_list_remove(&(container->children), &(child->sibling));
|
||||
/* remove widget from parent's children list */
|
||||
rtgui_list_remove(&(container->children), &(child->sibling));
|
||||
|
||||
/* set parent and toplevel widget */
|
||||
child->parent = RT_NULL;
|
||||
child->toplevel = RT_NULL;
|
||||
/* set parent and toplevel widget */
|
||||
child->parent = RT_NULL;
|
||||
child->toplevel = RT_NULL;
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_remove_child);
|
||||
|
||||
/* destroy all children of container */
|
||||
void rtgui_container_destroy_children(rtgui_container_t *container)
|
||||
{
|
||||
struct rtgui_list_node* node;
|
||||
struct rtgui_list_node *node;
|
||||
|
||||
if (container == RT_NULL)
|
||||
return;
|
||||
if (container == RT_NULL)
|
||||
return;
|
||||
|
||||
node = container->children.next;
|
||||
while (node != RT_NULL)
|
||||
{
|
||||
rtgui_widget_t* child = rtgui_list_entry(node, rtgui_widget_t, sibling);
|
||||
node = container->children.next;
|
||||
while (node != RT_NULL)
|
||||
{
|
||||
rtgui_widget_t *child = rtgui_list_entry(node, rtgui_widget_t, sibling);
|
||||
|
||||
if (RTGUI_IS_CONTAINER(child))
|
||||
{
|
||||
/* break parent firstly */
|
||||
child->parent = RT_NULL;
|
||||
if (RTGUI_IS_CONTAINER(child))
|
||||
{
|
||||
/* break parent firstly */
|
||||
child->parent = RT_NULL;
|
||||
|
||||
/* destroy children of child */
|
||||
rtgui_container_destroy_children(RTGUI_CONTAINER(child));
|
||||
}
|
||||
/* destroy children of child */
|
||||
rtgui_container_destroy_children(RTGUI_CONTAINER(child));
|
||||
}
|
||||
|
||||
/* remove widget from parent's children list */
|
||||
rtgui_list_remove(&(container->children), &(child->sibling));
|
||||
/* remove widget from parent's children list */
|
||||
rtgui_list_remove(&(container->children), &(child->sibling));
|
||||
|
||||
/* set parent and toplevel widget */
|
||||
child->parent = RT_NULL;
|
||||
/* set parent and toplevel widget */
|
||||
child->parent = RT_NULL;
|
||||
|
||||
/* destroy object and remove from parent */
|
||||
rtgui_object_destroy(RTGUI_OBJECT(child));
|
||||
/* destroy object and remove from parent */
|
||||
rtgui_object_destroy(RTGUI_OBJECT(child));
|
||||
|
||||
node = container->children.next;
|
||||
}
|
||||
node = container->children.next;
|
||||
}
|
||||
|
||||
container->children.next = RT_NULL;
|
||||
container->children.next = RT_NULL;
|
||||
|
||||
/* update widget clip */
|
||||
rtgui_win_update_clip(RTGUI_WIN(RTGUI_WIDGET(container)->toplevel));
|
||||
/* update widget clip */
|
||||
rtgui_win_update_clip(RTGUI_WIN(RTGUI_WIDGET(container)->toplevel));
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_destroy_children);
|
||||
|
||||
rtgui_widget_t* rtgui_container_get_first_child(rtgui_container_t* container)
|
||||
rtgui_widget_t *rtgui_container_get_first_child(rtgui_container_t *container)
|
||||
{
|
||||
rtgui_widget_t* child = RT_NULL;
|
||||
rtgui_widget_t *child = RT_NULL;
|
||||
|
||||
RT_ASSERT(container != RT_NULL);
|
||||
RT_ASSERT(container != RT_NULL);
|
||||
|
||||
if (container->children.next != RT_NULL)
|
||||
{
|
||||
child = rtgui_list_entry(container->children.next, rtgui_widget_t, sibling);
|
||||
}
|
||||
if (container->children.next != RT_NULL)
|
||||
{
|
||||
child = rtgui_list_entry(container->children.next, rtgui_widget_t, sibling);
|
||||
}
|
||||
|
||||
return child;
|
||||
return child;
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_get_first_child);
|
||||
|
||||
void rtgui_container_set_box(rtgui_container_t* container, struct rtgui_box* box)
|
||||
void rtgui_container_set_box(rtgui_container_t *container, struct rtgui_box *box)
|
||||
{
|
||||
if (container == RT_NULL || box == RT_NULL)
|
||||
if (container == RT_NULL || box == RT_NULL)
|
||||
return;
|
||||
|
||||
container->layout_box = box;
|
||||
box->container = container;
|
||||
container->layout_box = box;
|
||||
box->container = container;
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_set_box);
|
||||
|
||||
void rtgui_container_layout(struct rtgui_container* container)
|
||||
void rtgui_container_layout(struct rtgui_container *container)
|
||||
{
|
||||
if (container == RT_NULL || container->layout_box == RT_NULL)
|
||||
return;
|
||||
if (container == RT_NULL || container->layout_box == RT_NULL)
|
||||
return;
|
||||
|
||||
rtgui_box_layout(container->layout_box);
|
||||
rtgui_box_layout(container->layout_box);
|
||||
}
|
||||
RTM_EXPORT(rtgui_container_layout);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user