mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 18:17:39 -04:00
more gui_textarea removal.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17650 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
0cda59e939
commit
d0ed3712c7
1 changed files with 12 additions and 5 deletions
|
@ -40,7 +40,7 @@
|
|||
#include "backlight.h"
|
||||
#include "splash.h"
|
||||
#include "statusbar.h"
|
||||
#include "textarea.h"
|
||||
#include "viewport.h"
|
||||
|
||||
static void speak_time(int hours, int minutes, bool speak_hours)
|
||||
{
|
||||
|
@ -65,6 +65,7 @@ bool alarm_screen(void)
|
|||
int i;
|
||||
bool update = true;
|
||||
bool hour_wrapped = false;
|
||||
struct viewport vp[NB_SCREENS];
|
||||
|
||||
rtc_get_alarm(&h, &m);
|
||||
|
||||
|
@ -75,14 +76,18 @@ bool alarm_screen(void)
|
|||
} else {
|
||||
m = m / 5 * 5; /* 5 min accuracy should be enough */
|
||||
}
|
||||
FOR_NB_SCREENS(i)
|
||||
{
|
||||
viewport_set_defaults(&vp[i], i);
|
||||
}
|
||||
|
||||
while(!done) {
|
||||
if(update)
|
||||
{
|
||||
FOR_NB_SCREENS(i)
|
||||
{
|
||||
screens[i].setmargins(0, 0);
|
||||
gui_textarea_clear(&screens[i]);
|
||||
screens[i].set_viewport(&vp[i]);
|
||||
screens[i].clear_viewport();
|
||||
screens[i].puts(0, 3, str(LANG_ALARM_MOD_KEYS));
|
||||
}
|
||||
/* Talk when entering the wakeup screen */
|
||||
|
@ -97,8 +102,10 @@ bool alarm_screen(void)
|
|||
snprintf(buf, 32, str(LANG_ALARM_MOD_TIME), h, m);
|
||||
FOR_NB_SCREENS(i)
|
||||
{
|
||||
screens[i].set_viewport(&vp[i]);
|
||||
screens[i].puts(0, 1, buf);
|
||||
gui_textarea_update(&screens[i]);
|
||||
screens[i].update_viewport();
|
||||
screens[i].set_viewport(NULL);
|
||||
}
|
||||
button = get_action(CONTEXT_SETTINGS,HZ);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue