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 | |
| parent | 0a291fff12c27ba6b46521ecaf126bdb4726c24e (diff) | |
| download | rockbox-93f9e7cbfb3905791feccb4da68f6cc969d1e148.zip rockbox-93f9e7cbfb3905791feccb4da68f6cc969d1e148.tar.gz rockbox-93f9e7cbfb3905791feccb4da68f6cc969d1e148.tar.bz2 rockbox-93f9e7cbfb3905791feccb4da68f6cc969d1e148.tar.xz | |
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')
| -rw-r--r-- | apps/menus/main_menu.c | 6 | ||||
| -rw-r--r-- | apps/menus/time_menu.c | 13 |
2 files changed, 8 insertions, 11 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 505801d..7834902 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -415,13 +415,13 @@ static int sleep_timer(void) #if CONFIG_RTC int time_screen(void* ignored); -MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), time_screen, - NULL, NULL, Icon_Menu_setting ); +MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), + time_screen, NULL, NULL, Icon_Menu_setting ); #endif /* This item is in the time/date screen if there is a RTC */ MENUITEM_FUNCTION(sleep_timer_call, 0, ID2P(LANG_SLEEP_TIMER), sleep_timer, NULL, NULL, Icon_Menu_setting); /* make it look like a - setting to the user */ + setting to the user */ MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), (menu_function)show_credits, NULL, NULL, Icon_NOICON); diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index 757ce82..597f7e0 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c @@ -62,10 +62,10 @@ static int timedate_set(void) #define C2DIG2DEC(x) (S100(x)-100) tm.tm_hour = 0; - tm.tm_min = 0; - tm.tm_sec = 0; + tm.tm_min = 0; + tm.tm_sec = 0; tm.tm_mday = C2DIG2DEC(DAY); - tm.tm_mon = C2DIG2DEC(MONTH)-1; + tm.tm_mon = C2DIG2DEC(MONTH)-1; tm.tm_wday = 1; tm.tm_year = YEAR-1900; } @@ -193,8 +193,8 @@ static void draw_timedate(struct viewport *vp, struct screen *display) d = str(LANG_UNKNOWN); } - display->puts_scroll(0, line++, t); - display->puts_scroll(0, line, d); + display->puts(0, line++, t); + display->puts(0, line, d); display->update_viewport(); display->set_viewport(NULL); @@ -284,9 +284,6 @@ int time_screen(void* ignored) } ret = do_menu(&time_menu, NULL, menu, false); - FOR_NB_SCREENS(i) - screens[i].scroll_stop(&clock[i]); - /* see comments above in the button callback */ if (!menu_was_pressed && ret == GO_TO_PREVIOUS) return 0; |