forked from len0rd/rockbox
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
This commit is contained in:
parent
49865b23f6
commit
f0611f8781
2 changed files with 13 additions and 3 deletions
|
|
@ -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);
|
||||
#endif
|
||||
}
|
||||
#ifdef HAVE_TOUCHSCREEN
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue