diff options
| author | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-05-29 20:32:39 +0000 |
|---|---|---|
| committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-05-29 20:32:39 +0000 |
| commit | f76122f0e7a3b82962dbe005d58a643c835013d0 (patch) | |
| tree | 5c4e17d6bf78d70c5612191f9c2f70a561e35b77 /apps/gui | |
| parent | 0792596e1757a5ad91c3959d3721d812c8a282eb (diff) | |
| download | rockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.zip rockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.tar.gz rockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.tar.bz2 rockbox-f76122f0e7a3b82962dbe005d58a643c835013d0.tar.xz | |
Accept FS #9052 by Alexander Levin with a fix by me. Changes HAS_BUTTONBAR into HAVE_BUTTONBAR to bring it in line with the other defines
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17655 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/buttonbar.h | 2 | ||||
| -rw-r--r-- | apps/gui/list.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/gui/buttonbar.h b/apps/gui/buttonbar.h index 3098ecc..98eb83b 100644 --- a/apps/gui/buttonbar.h +++ b/apps/gui/buttonbar.h @@ -24,7 +24,7 @@ #include "screen_access.h" -#ifdef HAS_BUTTONBAR +#ifdef HAVE_BUTTONBAR #define BUTTONBAR_HEIGHT 8 #define BUTTONBAR_MAX_BUTTONS 3 #define BUTTONBAR_CAPTION_LENGTH 8 diff --git a/apps/gui/list.c b/apps/gui/list.c index ba25efd..a3df4a2 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -79,7 +79,7 @@ void list_init_viewports(struct gui_synclist *list) list->parent[i]->height = screens[i].height - list->parent[i]->y; } } -#ifdef HAS_BUTTONBAR +#ifdef HAVE_BUTTONBAR if (list && (list->parent[0] == &parent[0]) && global_settings.buttonbar) list->parent[0]->height -= BUTTONBAR_HEIGHT; #endif @@ -218,11 +218,11 @@ void gui_synclist_draw(struct gui_synclist *gui_list) int i; static struct gui_synclist *last_list = NULL; static int last_count = -1; -#ifdef HAS_BUTTONBAR +#ifdef HAVE_BUTTONBAR static bool last_buttonbar = false; #endif if (force_list_reinit || -#ifdef HAS_BUTTONBAR +#ifdef HAVE_BUTTONBAR last_buttonbar != screens[SCREEN_MAIN].has_buttonbar || #endif last_list != gui_list || @@ -231,7 +231,7 @@ void gui_synclist_draw(struct gui_synclist *gui_list) list_init_viewports(gui_list); force_list_reinit = false; } -#ifdef HAS_BUTTONBAR +#ifdef HAVE_BUTTONBAR last_buttonbar = screens[SCREEN_MAIN].has_buttonbar; #endif last_count = gui_list->nb_items; |