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 /apps/gui | |
parent | b2eb44ce0eb24632a46b0ea8c8c46a8f2ba35e24 (diff) | |
download | rockbox-dd9fbbf7c8128d48f5060e62b0af9dcea43ca317.tar.gz rockbox-dd9fbbf7c8128d48f5060e62b0af9dcea43ca317.zip |
fix red checkwps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23905 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-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 fbf5ea82ad..159e5b6913 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -28,8 +28,6 @@ | |||
28 | #include "screen_access.h" | 28 | #include "screen_access.h" |
29 | #include "settings.h" | 29 | #include "settings.h" |
30 | #include "misc.h" | 30 | #include "misc.h" |
31 | #include "panic.h" | ||
32 | #include "viewport.h" | ||
33 | 31 | ||
34 | /*some short cuts for fg/bg/line selector handling */ | 32 | /*some short cuts for fg/bg/line selector handling */ |
35 | #ifdef HAVE_LCD_COLOR | 33 | #ifdef HAVE_LCD_COLOR |
@@ -49,6 +47,7 @@ | |||
49 | #include "system.h" | 47 | #include "system.h" |
50 | #include "statusbar.h" | 48 | #include "statusbar.h" |
51 | #include "appevents.h" | 49 | #include "appevents.h" |
50 | #include "panic.h" | ||
52 | #ifdef HAVE_LCD_BITMAP | 51 | #ifdef HAVE_LCD_BITMAP |
53 | #include "language.h" | 52 | #include "language.h" |
54 | #endif | 53 | #endif |
@@ -307,10 +306,8 @@ bool viewport_point_within_vp(const struct viewport *vp, | |||
307 | static void set_default_align_flags(struct viewport *vp) | 306 | static void set_default_align_flags(struct viewport *vp) |
308 | { | 307 | { |
309 | vp->flags &= ~VP_FLAG_ALIGNMENT_MASK; | 308 | vp->flags &= ~VP_FLAG_ALIGNMENT_MASK; |
310 | #ifndef __PCTOOL__ | ||
311 | if (UNLIKELY(lang_is_rtl())) | 309 | if (UNLIKELY(lang_is_rtl())) |
312 | vp->flags |= VP_FLAG_ALIGN_RIGHT; | 310 | vp->flags |= VP_FLAG_ALIGN_RIGHT; |
313 | #endif | ||
314 | } | 311 | } |
315 | 312 | ||
316 | #endif /* HAVE_LCD_BITMAP */ | 313 | #endif /* HAVE_LCD_BITMAP */ |
@@ -332,7 +329,9 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
332 | vp->height = screens[screen].lcdheight; | 329 | vp->height = screens[screen].lcdheight; |
333 | 330 | ||
334 | #ifdef HAVE_LCD_BITMAP | 331 | #ifdef HAVE_LCD_BITMAP |
332 | #ifndef __PCTOOL__ | ||
335 | set_default_align_flags(vp); | 333 | set_default_align_flags(vp); |
334 | #endif | ||
336 | vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */ | 335 | vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */ |
337 | vp->drawmode = DRMODE_SOLID; | 336 | vp->drawmode = DRMODE_SOLID; |
338 | #if LCD_DEPTH > 1 | 337 | #if LCD_DEPTH > 1 |
@@ -520,7 +519,9 @@ const char* viewport_parse_viewport(struct viewport *vp, | |||
520 | 519 | ||
521 | /* Set the defaults for fields not user-specified */ | 520 | /* Set the defaults for fields not user-specified */ |
522 | vp->drawmode = DRMODE_SOLID; | 521 | vp->drawmode = DRMODE_SOLID; |
522 | #ifndef __PCTOOL__ | ||
523 | set_default_align_flags(vp); | 523 | set_default_align_flags(vp); |
524 | #endif | ||
524 | 525 | ||
525 | return ptr; | 526 | return ptr; |
526 | } | 527 | } |