diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-05-04 10:58:05 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-05-04 10:58:05 +0000 |
commit | daa8341a13ddc93981d2c2178b183a13b5e08950 (patch) | |
tree | 3a4946cb4b66d0e475aa04bdd8fafc5bd4a5b3e5 /apps/gui | |
parent | 977ad4b5a185cede164cfab9b52ba808bd7ed560 (diff) | |
download | rockbox-daa8341a13ddc93981d2c2178b183a13b5e08950.tar.gz rockbox-daa8341a13ddc93981d2c2178b183a13b5e08950.zip |
a bit of code cleanup.. use a single function to get the statusbar height (or lack of if its enabled), and remove some gui_textarea stuff which could be done using the splash. (gui_textarea is on the way out)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17350 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/charcell/list.c | 4 | ||||
-rw-r--r-- | apps/gui/list.c | 2 | ||||
-rw-r--r-- | apps/gui/statusbar.c | 6 | ||||
-rw-r--r-- | apps/gui/statusbar.h | 2 | ||||
-rw-r--r-- | apps/gui/viewport.c | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c index 64f2fecbbd..bba688d698 100644 --- a/apps/gui/charcell/list.c +++ b/apps/gui/charcell/list.c | |||
@@ -54,7 +54,7 @@ void list_draw(struct screen *display, struct viewport *parent, | |||
54 | display->set_viewport(NULL); | 54 | display->set_viewport(NULL); |
55 | lines = display->nb_lines; | 55 | lines = display->nb_lines; |
56 | 56 | ||
57 | gui_textarea_clear(display); | 57 | display->clear_display(); |
58 | start = 0; | 58 | start = 0; |
59 | end = display->nb_lines; | 59 | end = display->nb_lines; |
60 | gui_list->last_displayed_start_item[display->screen_type] = | 60 | gui_list->last_displayed_start_item[display->screen_type] = |
@@ -126,5 +126,5 @@ void list_draw(struct screen *display, struct viewport *parent, | |||
126 | } | 126 | } |
127 | 127 | ||
128 | display->update_viewport(); | 128 | display->update_viewport(); |
129 | gui_textarea_update(display); | 129 | display->update(); |
130 | } | 130 | } |
diff --git a/apps/gui/list.c b/apps/gui/list.c index 6b4229545d..1e2b682e6e 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -76,7 +76,7 @@ void list_init_viewports(struct gui_synclist *list) | |||
76 | else if (list->parent[i] == vp) | 76 | else if (list->parent[i] == vp) |
77 | { | 77 | { |
78 | viewport_set_defaults(vp, i); | 78 | viewport_set_defaults(vp, i); |
79 | list->parent[i]->y = global_settings.statusbar?STATUSBAR_HEIGHT:0; | 79 | list->parent[i]->y = gui_statusbar_height(); |
80 | list->parent[i]->height = screens[i].height - list->parent[i]->y; | 80 | list->parent[i]->height = screens[i].height - list->parent[i]->y; |
81 | } | 81 | } |
82 | } | 82 | } |
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 043fbd3e76..436e3d6cca 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -797,3 +797,9 @@ void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, | |||
797 | gui_statusbar_draw( &(bars->statusbars[i]), force_redraw ); | 797 | gui_statusbar_draw( &(bars->statusbars[i]), force_redraw ); |
798 | } | 798 | } |
799 | } | 799 | } |
800 | |||
801 | int gui_statusbar_height(void) | ||
802 | { | ||
803 | return global_settings.statusbar ? STATUSBAR_HEIGHT : 0; | ||
804 | } | ||
805 | |||
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h index 8862620596..989d1cbe3c 100644 --- a/apps/gui/statusbar.h +++ b/apps/gui/statusbar.h | |||
@@ -95,5 +95,5 @@ struct gui_syncstatusbar | |||
95 | 95 | ||
96 | extern void gui_syncstatusbar_init(struct gui_syncstatusbar * bars); | 96 | extern void gui_syncstatusbar_init(struct gui_syncstatusbar * bars); |
97 | extern void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, bool force_redraw); | 97 | extern void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, bool force_redraw); |
98 | 98 | extern int gui_statusbar_height(void); | |
99 | #endif /*_GUI_STATUSBAR_H_*/ | 99 | #endif /*_GUI_STATUSBAR_H_*/ |
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 86ecd995ca..fbf520eed7 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -50,7 +50,7 @@ void viewport_set_defaults(struct viewport *vp, enum screen_type screen) | |||
50 | vp->x = 0; | 50 | vp->x = 0; |
51 | vp->width = screens[screen].width; | 51 | vp->width = screens[screen].width; |
52 | 52 | ||
53 | vp->y = global_settings.statusbar?STATUSBAR_HEIGHT:0; | 53 | vp->y = gui_statusbar_height(); |
54 | vp->height = screens[screen].height - vp->y; | 54 | vp->height = screens[screen].height - vp->y; |
55 | #ifdef HAVE_LCD_BITMAP | 55 | #ifdef HAVE_LCD_BITMAP |
56 | vp->drawmode = DRMODE_SOLID; | 56 | vp->drawmode = DRMODE_SOLID; |