diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2010-02-11 10:41:06 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2010-02-11 10:41:06 +0000 |
commit | 93f9e7cbfb3905791feccb4da68f6cc969d1e148 (patch) | |
tree | fb6e01220844fa1c0a9f92643ccaddb70fcb66b4 /apps/menus/time_menu.c | |
parent | 0a291fff12c27ba6b46521ecaf126bdb4726c24e (diff) | |
download | rockbox-93f9e7cbfb3905791feccb4da68f6cc969d1e148.tar.gz rockbox-93f9e7cbfb3905791feccb4da68f6cc969d1e148.zip |
fix text scrolling handling in do_menu, set_time_screen and time_screen.
Don't scroll text in time_screen(). the lines will be redrawn before scrolling statrs, so they don't scroll anyway.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24591 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/time_menu.c')
-rw-r--r-- | apps/menus/time_menu.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index 757ce82928..597f7e0c3a 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c | |||
@@ -62,10 +62,10 @@ static int timedate_set(void) | |||
62 | #define C2DIG2DEC(x) (S100(x)-100) | 62 | #define C2DIG2DEC(x) (S100(x)-100) |
63 | 63 | ||
64 | tm.tm_hour = 0; | 64 | tm.tm_hour = 0; |
65 | tm.tm_min = 0; | 65 | tm.tm_min = 0; |
66 | tm.tm_sec = 0; | 66 | tm.tm_sec = 0; |
67 | tm.tm_mday = C2DIG2DEC(DAY); | 67 | tm.tm_mday = C2DIG2DEC(DAY); |
68 | tm.tm_mon = C2DIG2DEC(MONTH)-1; | 68 | tm.tm_mon = C2DIG2DEC(MONTH)-1; |
69 | tm.tm_wday = 1; | 69 | tm.tm_wday = 1; |
70 | tm.tm_year = YEAR-1900; | 70 | tm.tm_year = YEAR-1900; |
71 | } | 71 | } |
@@ -193,8 +193,8 @@ static void draw_timedate(struct viewport *vp, struct screen *display) | |||
193 | d = str(LANG_UNKNOWN); | 193 | d = str(LANG_UNKNOWN); |
194 | } | 194 | } |
195 | 195 | ||
196 | display->puts_scroll(0, line++, t); | 196 | display->puts(0, line++, t); |
197 | display->puts_scroll(0, line, d); | 197 | display->puts(0, line, d); |
198 | 198 | ||
199 | display->update_viewport(); | 199 | display->update_viewport(); |
200 | display->set_viewport(NULL); | 200 | display->set_viewport(NULL); |
@@ -284,9 +284,6 @@ int time_screen(void* ignored) | |||
284 | } | 284 | } |
285 | 285 | ||
286 | ret = do_menu(&time_menu, NULL, menu, false); | 286 | ret = do_menu(&time_menu, NULL, menu, false); |
287 | FOR_NB_SCREENS(i) | ||
288 | screens[i].scroll_stop(&clock[i]); | ||
289 | |||
290 | /* see comments above in the button callback */ | 287 | /* see comments above in the button callback */ |
291 | if (!menu_was_pressed && ret == GO_TO_PREVIOUS) | 288 | if (!menu_was_pressed && ret == GO_TO_PREVIOUS) |
292 | return 0; | 289 | return 0; |