devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix red: Protect viewport RTL flag manipulation with #ifdef HAVE_LCD_BITMAP

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22973 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2009-10-05 21:32:29 +00:00
parent 45f004de25
commit 5da75070c1
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/gui/viewport.c
View file

@ -55,7 +55,9 @@
#include "system.h" #include "system.h"
#include "statusbar.h" #include "statusbar.h"
#include "appevents.h" #include "appevents.h"
#ifdef HAVE_LCD_BITMAP
#include "language.h" #include "language.h"
#endif
static int statusbar_enabled = 0; static int statusbar_enabled = 0;
@ -148,8 +150,10 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
#endif #endif
viewport_set_fullscreen(vp, screen); viewport_set_fullscreen(vp, screen);
#ifdef HAVE_LCD_BITMAP
vp->flags &= ~VP_IS_RTL; vp->flags &= ~VP_IS_RTL;
vp->flags |= lang_is_rtl() ? VP_IS_RTL : 0; vp->flags |= lang_is_rtl() ? VP_IS_RTL : 0;
#endif
} }
void viewportmanager_init(void) void viewportmanager_init(void)

4
apps/language.c
View file

@ -25,7 +25,9 @@
#include "lang.h" #include "lang.h"
#include "debug.h" #include "debug.h"
#include "string.h" #include "string.h"
#ifdef HAVE_LCD_BITMAP
#include "viewport.h" #include "viewport.h"
#endif
/* The following header is generated by the build system and only defines /* The following header is generated by the build system and only defines
MAX_LANGUAGE_SIZE to be the size of the largest currently available MAX_LANGUAGE_SIZE to be the size of the largest currently available
@ -114,7 +116,9 @@ int lang_load(const char *filename)
else else
{ {
lang_options = lang_header[3]; lang_options = lang_header[3];
#ifdef HAVE_LCD_BITMAP
viewportmanager_theme_changed(THEME_UI_VIEWPORT); viewportmanager_theme_changed(THEME_UI_VIEWPORT);
#endif
} }
return retcode; return retcode;
} }