summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-08-04 12:00:18 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-08-04 12:00:18 +0000
commitf0611f878101caa323b3b0693c0cf7170f59fe00 (patch)
treea49fa2bbc82d99c21d52c6db4d0991797228e50c
parent49865b23f601e636c9a80b21826fc607f1964eb5 (diff)
downloadrockbox-f0611f878101caa323b3b0693c0cf7170f59fe00.tar.gz
rockbox-f0611f878101caa323b3b0693c0cf7170f59fe00.tar.bz2
rockbox-f0611f878101caa323b3b0693c0cf7170f59fe00.zip
Force touchscreen targets into 3x3 grid mode when entering the wps/radio if the skin hasnt set any regions
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27692 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/wps.c9
-rw-r--r--apps/radio/radio_skin.c5
2 files changed, 12 insertions, 2 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 8b3f671e34..df00080f2c 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -633,6 +633,9 @@ static void gwps_leave_wps(void)
#endif
/* unhandle statusbar update delay */
sb_skin_set_update_delay(DEFAULT_UPDATE_DELAY);
+#ifdef HAVE_TOUCHSCREEN
+ touchscreen_set_mode(global_settings.touch_mode);
+#endif
}
/*
@@ -665,10 +668,12 @@ static void gwps_enter_wps(void)
display->clear_display();
skin_update(gwps, SKIN_REFRESH_ALL);
+ }
#ifdef HAVE_TOUCHSCREEN
- skin_disarm_touchregions(gui_wps[i].data);
+ skin_disarm_touchregions(gui_wps[SCREEN_MAIN].data);
+ if (!gui_wps[SCREEN_MAIN].data->touchregions)
+ touchscreen_set_mode(TOUCHSCREEN_BUTTON);
#endif
- }
/* force statusbar/skin update since we just cleared the whole screen */
send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
}
diff --git a/apps/radio/radio_skin.c b/apps/radio/radio_skin.c
index c7994b3135..6bc6c377d4 100644
--- a/apps/radio/radio_skin.c
+++ b/apps/radio/radio_skin.c
@@ -85,6 +85,11 @@ void fms_fix_displays(enum fms_exiting toggle_state)
viewportmanager_theme_undo(i, skin_has_sbs(i, fms_skin[i].data));
}
}
+#ifdef HAVE_TOUCHSCREEN
+ if (!fms_skin[SCREEN_MAIN].data->touchregions)
+ touchscreen_set_mode(toggle_state == FMS_ENTER ?
+ TOUCHSCREEN_BUTTON : global_settings.touch_mode);
+#endif
}