summaryrefslogtreecommitdiff
path: root/rtgui
diff options
context:
space:
mode:
authorbernard.xiong <[email protected]>2009-11-24 23:58:47 +0000
committerbernard.xiong <[email protected]>2009-11-24 23:58:47 +0000
commitf3335885b2430e011555bed40db1232b044813fd (patch)
tree1d60e1c09e4b4240a4555b74fc83263ab5550b35 /rtgui
parentf02f4c1ca1304c31336d263223334de55db2c178 (diff)
radio project can play mp3/wav file.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@175 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'rtgui')
-rw-r--r--rtgui/widgets/view.c1
-rw-r--r--rtgui/widgets/workbench.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/rtgui/widgets/view.c b/rtgui/widgets/view.c
index 4c2b5293da..fdc301ae45 100644
--- a/rtgui/widgets/view.c
+++ b/rtgui/widgets/view.c
@@ -144,6 +144,7 @@ rtgui_modal_code_t rtgui_view_show(rtgui_view_t* view, rt_bool_t is_modal)
if (RTGUI_WIDGET_IS_FOCUSABLE(RTGUI_WIDGET(view)))
rtgui_widget_focus(RTGUI_WIDGET(view));
+ view->modal_show = is_modal;
if (is_modal == RT_TRUE)
{
/* set modal mode */
diff --git a/rtgui/widgets/workbench.c b/rtgui/widgets/workbench.c
index 239237bb3e..a8d52b8484 100644
--- a/rtgui/widgets/workbench.c
+++ b/rtgui/widgets/workbench.c
@@ -164,9 +164,6 @@ rt_bool_t rtgui_workbench_event_loop(rtgui_workbench_t* workbench)
char event_buf[256];
struct rtgui_event* event = (struct rtgui_event*)&event_buf[0];
- /* show workbench firstly */
- rtgui_workbench_show(workbench);
-
if (workbench->flag & RTGUI_WORKBENCH_FLAG_MODAL_MODE)
{
/* event loop for modal mode shown view */
@@ -180,6 +177,9 @@ rt_bool_t rtgui_workbench_event_loop(rtgui_workbench_t* workbench)
}
else
{
+ /* show workbench firstly */
+ rtgui_workbench_show(workbench);
+
while (!(workbench->flag & RTGUI_WORKBENCH_FLAG_CLOSED))
{
if (rtgui_thread_recv(event, sizeof(event_buf)) == RT_EOK)