libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sync RTGUI with github(https://github.com/RT-Thread/RTGUI) 9573987ab967d6823151f967e4715a995579c8e5 

As always, full log is in GitHub.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2301 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
dzzxzz@gmail.com 2012-09-20 08:13:23 +00:00
parent 2d6bb86360
commit bcc6ffac9e
4 changed files with 43 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/rtgui/common/filerw.c
View File

@ -214,11 +214,7 @@ static int parse_mode(const char *mode)
switch (*mode)
{
case 0: return f;
#ifdef _WIN32
case 'b': f|=O_BINARY;break;
#else
case 'b': break;
#endif
case 'r': f=O_RDONLY; break;
case 'w': f=O_WRONLY|O_CREAT|O_TRUNC; break;
case 'a': f=O_WRONLY|O_CREAT|O_APPEND; break;

94
components/rtgui/server/topwin.c
View File

@ -485,22 +485,44 @@ rt_err_t rtgui_topwin_activate(struct rtgui_event_win_activate* event)
return rtgui_topwin_activate_topwin(topwin);
}
static void _rtgui_topwin_draw_tree(struct rtgui_topwin *topwin, struct rtgui_event_paint *epaint)
{
struct rtgui_dlist_node *node;
if (topwin->title != RT_NULL)
{
rtgui_theme_draw_win(topwin);
}
epaint->wid = topwin->wid;
rtgui_send(topwin->tid, &(epaint->parent), sizeof(struct rtgui_event_paint));
rtgui_dlist_foreach(node, &topwin->child_list, prev)
{
if (!(get_topwin_from_list(node)->flag & WINTITLE_SHOWN))
return;
_rtgui_topwin_draw_tree(get_topwin_from_list(node), epaint);
}
}
rt_err_t rtgui_topwin_activate_topwin(struct rtgui_topwin* topwin)
{
struct rtgui_topwin *old_focus_topwin;
struct rtgui_event_paint epaint;
RT_ASSERT(topwin != RT_NULL);
RTGUI_EVENT_PAINT_INIT(&epaint);
if (!(topwin->flag & WINTITLE_SHOWN))
return -RT_ERROR;
if (topwin->flag & WINTITLE_NOFOCUS)
{
/* just raise it, not affect others. */
_rtgui_topwin_raise_tree_from_root(topwin);
/* update clip info */
rtgui_topwin_update_clip();
/* just raise and show, not affect others. */
_rtgui_topwin_raise_tree_from_root(topwin);
rtgui_topwin_update_clip();
_rtgui_topwin_draw_tree(topwin, &epaint);
return RT_EOK;
}
@ -513,7 +535,7 @@ rt_err_t rtgui_topwin_activate_topwin(struct rtgui_topwin* topwin)
RT_ASSERT(old_focus_topwin != topwin);
_rtgui_topwin_raise_tree_from_root(topwin);
/* update clip info */
/* clip before active the window, so we could get right boarder region. */
rtgui_topwin_update_clip();
if (old_focus_topwin != RT_NULL)
@ -525,6 +547,8 @@ rt_err_t rtgui_topwin_activate_topwin(struct rtgui_topwin* topwin)
_rtgui_topwin_only_activate(topwin);
_rtgui_topwin_draw_tree(topwin, &epaint);
return RT_EOK;
}
@ -570,53 +594,10 @@ rt_inline void _rtgui_topwin_mark_shown(struct rtgui_topwin *topwin)
RTGUI_WIDGET_UNHIDE(topwin->wid);
}
static void _rtgui_topwin_draw_tree(struct rtgui_topwin *topwin, struct rtgui_event_paint *epaint)
{
struct rtgui_dlist_node *node;
if (topwin->title != RT_NULL)
{
rtgui_theme_draw_win(topwin);
}
epaint->wid = topwin->wid;
rtgui_send(topwin->tid, &(epaint->parent), sizeof(struct rtgui_event_paint));
rtgui_dlist_foreach(node, &topwin->child_list, prev)
{
if (!(get_topwin_from_list(node)->flag & WINTITLE_SHOWN))
return;
_rtgui_topwin_draw_tree(get_topwin_from_list(node), epaint);
}
}
/* show the window tree. @param epaint can be initialized outside and reduce stack
* usage. */
static void _rtgui_topwin_show_tree(struct rtgui_topwin *topwin, struct rtgui_event_paint *epaint)
{
RT_ASSERT(topwin != RT_NULL);
RT_ASSERT(epaint != RT_NULL);
_rtgui_topwin_raise_tree_from_root(topwin);
/* we have to mark the _all_ tree before update_clip because update_clip
* will stop as hidden windows */
_rtgui_topwin_preorder_map(topwin, _rtgui_topwin_mark_shown);
// TODO: if all the window is shown already, there is no need to
// update_clip. But since we use peorder_map, it seems it's a bit difficult
// to tell whether @param topwin and it's children are all shown.
rtgui_topwin_update_clip();
_rtgui_topwin_draw_tree(topwin, epaint);
}
rt_err_t rtgui_topwin_show(struct rtgui_event_win* event)
{
struct rtgui_topwin *topwin, *old_focus;
struct rtgui_topwin *topwin;
struct rtgui_win* wid = event->wid;
struct rtgui_event_paint epaint;
RTGUI_EVENT_PAINT_INIT(&epaint);
topwin = rtgui_topwin_search_in_list(wid, &_rtgui_topwin_list);
/* no such a window recorded */
@ -633,15 +614,8 @@ rt_err_t rtgui_topwin_show(struct rtgui_event_win* event)
return -RT_ERROR;
}
old_focus = rtgui_topwin_get_focus();
_rtgui_topwin_show_tree(topwin, &epaint);
/* we don't want double clipping(bare rtgui_topwin_activate_win will clip),
* so we have to do deactivate/activate manually. */
if (old_focus && old_focus != topwin)
_rtgui_topwin_deactivate(old_focus);
_rtgui_topwin_only_activate(topwin);
_rtgui_topwin_preorder_map(topwin, _rtgui_topwin_mark_shown);
rtgui_topwin_activate_topwin(topwin);
return RT_EOK;
}
@ -711,6 +685,8 @@ rt_err_t rtgui_topwin_hide(struct rtgui_event_win* event)
_rtgui_topwin_activate_next(topwin->flag);
}
topwin->flag &= ~WINTITLE_ACTIVATE;
return RT_EOK;
}

13
components/rtgui/widgets/label.c
View File

@ -103,14 +103,17 @@ void rtgui_label_set_text(rtgui_label_t* label, const char* text)
if (label->text != RT_NULL)
{
/* it's a same text string */
if (rt_strncmp(text, label->text, rt_strlen(text)) == 0) return;
if (rt_strcmp(text, label->text) == 0)
return;
/* release old text memory */
rtgui_free(label->text);
rt_free(label->text);
}
if (text != RT_NULL) label->text = (char*)rt_strdup((const char*)text);
else label->text = RT_NULL;
if (text != RT_NULL)
label->text = (char*)rt_strdup((const char*)text);
else
label->text = RT_NULL;
/* update widget */
rtgui_theme_draw_label(label);

14
components/rtgui/widgets/window.c
View File

@ -493,13 +493,6 @@ rt_bool_t rtgui_win_event_handler(struct rtgui_object* object, struct rtgui_even
}
win->flag |= RTGUI_WIN_FLAG_ACTIVATE;
#ifndef RTGUI_USING_SMALL_SIZE
if (RTGUI_WIDGET(object)->on_draw != RT_NULL)
RTGUI_WIDGET(object)->on_draw(object, event);
else
#endif
rtgui_widget_update(RTGUI_WIDGET(win));
if (win->on_activate != RT_NULL)
{
win->on_activate(RTGUI_OBJECT(object), event);
@ -522,13 +515,6 @@ rt_bool_t rtgui_win_event_handler(struct rtgui_object* object, struct rtgui_even
else
{
win->flag &= ~RTGUI_WIN_FLAG_ACTIVATE;
#ifndef RTGUI_USING_SMALL_SIZE
if (RTGUI_WIDGET(object)->on_draw != RT_NULL)
RTGUI_WIDGET(object)->on_draw(object, event);
else
#endif
rtgui_widget_update(RTGUI_WIDGET(win));
if (win->on_deactivate != RT_NULL)
{
win->on_deactivate(RTGUI_OBJECT(object), event);