diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-12-09 07:44:08 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-12-09 07:44:08 +0000 |
| commit | dd9fbbf7c8128d48f5060e62b0af9dcea43ca317 (patch) | |
| tree | 95297bebf6c41e9128e65be5778a7f41c040296c | |
| parent | b2eb44ce0eb24632a46b0ea8c8c46a8f2ba35e24 (diff) | |
| download | rockbox-dd9fbbf7c8128d48f5060e62b0af9dcea43ca317.zip rockbox-dd9fbbf7c8128d48f5060e62b0af9dcea43ca317.tar.gz rockbox-dd9fbbf7c8128d48f5060e62b0af9dcea43ca317.tar.bz2 rockbox-dd9fbbf7c8128d48f5060e62b0af9dcea43ca317.tar.xz | |
fix red checkwps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23905 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/gui/viewport.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index fbf5ea8..159e5b6 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c @@ -28,8 +28,6 @@ #include "screen_access.h" #include "settings.h" #include "misc.h" -#include "panic.h" -#include "viewport.h" /*some short cuts for fg/bg/line selector handling */ #ifdef HAVE_LCD_COLOR @@ -49,6 +47,7 @@ #include "system.h" #include "statusbar.h" #include "appevents.h" +#include "panic.h" #ifdef HAVE_LCD_BITMAP #include "language.h" #endif @@ -307,10 +306,8 @@ bool viewport_point_within_vp(const struct viewport *vp, static void set_default_align_flags(struct viewport *vp) { vp->flags &= ~VP_FLAG_ALIGNMENT_MASK; -#ifndef __PCTOOL__ if (UNLIKELY(lang_is_rtl())) vp->flags |= VP_FLAG_ALIGN_RIGHT; -#endif } #endif /* HAVE_LCD_BITMAP */ @@ -332,7 +329,9 @@ void viewport_set_fullscreen(struct viewport *vp, vp->height = screens[screen].lcdheight; #ifdef HAVE_LCD_BITMAP +#ifndef __PCTOOL__ set_default_align_flags(vp); +#endif vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */ vp->drawmode = DRMODE_SOLID; #if LCD_DEPTH > 1 @@ -520,7 +519,9 @@ const char* viewport_parse_viewport(struct viewport *vp, /* Set the defaults for fields not user-specified */ vp->drawmode = DRMODE_SOLID; +#ifndef __PCTOOL__ set_default_align_flags(vp); +#endif return ptr; } |