diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2009-10-11 00:05:12 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2009-10-11 00:05:12 +0000 |
| commit | a27f2b8683204e337b142124979592ee1cd0d6f9 (patch) | |
| tree | 2ba4041e90f3ae6fbbaf378a9c8f8718fc5f10e6 /apps/gui/viewport.c | |
| parent | 30d664bbbc1a6a160f9fed03e619c0a6e8440970 (diff) | |
| download | rockbox-a27f2b8683204e337b142124979592ee1cd0d6f9.tar.gz rockbox-a27f2b8683204e337b142124979592ee1cd0d6f9.zip | |
A bit of const correctness and 80-char limit correction.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23083 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/viewport.c')
| -rw-r--r-- | apps/gui/viewport.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index d8e5d721e9..6f9abb74a0 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c @@ -102,7 +102,8 @@ static bool showing_bars(enum screen_type screen) return false; } -void viewport_set_fullscreen(struct viewport *vp, enum screen_type screen) +void viewport_set_fullscreen(struct viewport *vp, + const enum screen_type screen) { vp->x = 0; vp->width = screens[screen].lcdwidth; @@ -113,14 +114,16 @@ void viewport_set_fullscreen(struct viewport *vp, enum screen_type screen) vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */ vp->height = screens[screen].lcdheight; - if (statusbar_position(screen) != STATUSBAR_BOTTOM && showing_bars(screen)) + if (statusbar_position(screen) != STATUSBAR_BOTTOM + && showing_bars(screen)) vp->y = STATUSBAR_HEIGHT; else vp->y = 0; #else vp->y = 0; #endif - vp->height = screens[screen].lcdheight - (showing_bars(screen)?STATUSBAR_HEIGHT:0); + vp->height = screens[screen].lcdheight + - (showing_bars(screen)?STATUSBAR_HEIGHT:0); #if LCD_DEPTH > 1 #ifdef HAVE_REMOTE_LCD @@ -144,7 +147,8 @@ void viewport_set_fullscreen(struct viewport *vp, enum screen_type screen) } -void viewport_set_defaults(struct viewport *vp, enum screen_type screen) +void viewport_set_defaults(struct viewport *vp, + const enum screen_type screen) { #ifdef HAVE_LCD_BITMAP if (ui_vp_info.active[screen]) @@ -173,7 +177,7 @@ int viewportmanager_get_statusbar(void) return statusbar_enabled; } -int viewportmanager_set_statusbar(int enabled) +int viewportmanager_set_statusbar(const int enabled) { int old = statusbar_enabled; statusbar_enabled = enabled; @@ -214,7 +218,7 @@ static void statusbar_toggled(void* param) viewportmanager_theme_changed(THEME_STATUSBAR); } -void viewportmanager_theme_changed(int which) +void viewportmanager_theme_changed(const int which) { int i; #ifdef HAVE_BUTTONBAR @@ -341,7 +345,8 @@ static unsigned viewport_init_ui_vp(void) #ifdef HAVE_TOUCHSCREEN /* check if a point (x and y coordinates) are within a viewport */ -bool viewport_point_within_vp(const struct viewport *vp, int x, int y) +bool viewport_point_within_vp(const struct viewport *vp, + const int x, const int y) { bool is_x = (x >= vp->x && x < (vp->x + vp->width)); bool is_y = (y >= vp->y && y < (vp->y + vp->height)); |