diff options
| author | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-06-28 20:45:21 +0000 |
|---|---|---|
| committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-06-28 20:45:21 +0000 |
| commit | 205f3df7816a1eea9c812ea285d74a4f8ecfad2a (patch) | |
| tree | 356be7b807a4407b7e243ec57da4d5068fe09ab1 /apps/gui/wps_parser.c | |
| parent | 3d240f1e2a34e616c2aba22b58ea78de7f277127 (diff) | |
| download | rockbox-205f3df7816a1eea9c812ea285d74a4f8ecfad2a.zip rockbox-205f3df7816a1eea9c812ea285d74a4f8ecfad2a.tar.gz rockbox-205f3df7816a1eea9c812ea285d74a4f8ecfad2a.tar.bz2 rockbox-205f3df7816a1eea9c812ea285d74a4f8ecfad2a.tar.xz | |
Remove a viewport ambiguity by changing the screens width/heigth members into lcdwidth/lcdheight. Normal usercode should always use getwidth()/getheigth() as that returns the viewport width/height. Fixes issues that would have appeared in many places when introducing viewports with sizes != lcd sizes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17857 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/wps_parser.c')
| -rw-r--r-- | apps/gui/wps_parser.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index e89f269..73516f6 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c @@ -1550,16 +1550,17 @@ bool wps_data_load(struct wps_data *wps_data, /* Initialise the first (default) viewport */ wps_data->viewports[0].vp.x = 0; - wps_data->viewports[0].vp.width = display->width; + wps_data->viewports[0].vp.width = display->getwidth(); if (!global_settings.statusbar) { wps_data->viewports[0].vp.y = 0; - wps_data->viewports[0].vp.height = display->height; + wps_data->viewports[0].vp.height = display->getheight(); } else { wps_data->viewports[0].vp.y = STATUSBAR_HEIGHT; - wps_data->viewports[0].vp.height = display->height - STATUSBAR_HEIGHT; + wps_data->viewports[0].vp.height = display->getheight() - + STATUSBAR_HEIGHT; } #ifdef HAVE_LCD_BITMAP wps_data->viewports[0].vp.font = FONT_UI; |