From 268c6d1e7f54379f78a8a69002ad133056f7f452 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sun, 11 Apr 2010 12:28:02 +0000 Subject: Fix two viewport related charcell bugs: crashes in the yesno screen and the USB screen. This mess should really be fixed properly by enabling viewport management for charcell. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25587 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/usb_screen.c | 5 ++++- apps/gui/yesno.c | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 022d574c1d..019aec61ff 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c @@ -270,7 +270,10 @@ void gui_usb_screen_run(void) struct screen *screen = &screens[i]; screen->set_viewport(NULL); -#ifdef HAVE_LCD_BITMAP +#ifdef HAVE_LCD_CHARCELLS + /* Quick fix. Viewports should really be enabled proper for charcell */ + viewport_set_defaults(&usb_screen_vps_ar[i].parent, i); +#else usb_screen_fix_viewports(screen, &usb_screen_vps_ar[i]); #endif } diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index a153a43fec..a834aa7b06 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c @@ -144,7 +144,12 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, yn[i].result_message[YESNO_NO]=no_message; yn[i].display=&screens[i]; yn[i].vp = &vp[i]; +#ifdef HAVE_LCD_CHARCELLS + /* Quick fix. Viewports should really be enabled proper for charcell */ + viewport_set_defaults(yn[i].vp, i); +#else viewportmanager_theme_enable(i, true, yn[i].vp); +#endif screens[i].stop_scroll(); gui_yesno_draw(&(yn[i])); } -- cgit v1.2.3