From 658026e6267277b27d297c481728f74d160a8481 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Fri, 17 Jul 2020 10:31:31 -0400 Subject: [4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice. Note: I left behind lcd_bitmap in features.txt, because removing it would require considerable work in the manual and the translations. Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a --- apps/gui/list.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'apps/gui/list.h') diff --git a/apps/gui/list.h b/apps/gui/list.h index 9107bf0591..f860e27bf9 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h @@ -102,9 +102,7 @@ struct gui_synclist int selected_size; /* the number of pixels each line occupies (including optional padding on touchscreen */ int line_height[NB_SCREENS]; -#ifdef HAVE_LCD_BITMAP int offset_position[NB_SCREENS]; /* the list's screen scroll placement in pixels */ -#endif long scheduled_talk_tick, last_talked_tick, dirty_tick; list_get_icon *callback_get_item_icon; @@ -127,14 +125,12 @@ struct gui_synclist }; -#ifdef HAVE_LCD_BITMAP extern void list_init(void); /* parse global setting to static int */ extern void gui_list_screen_scroll_step(int ofs); /* parse global setting to static bool */ extern void gui_list_screen_scroll_out_of_view(bool enable); -#endif /* HAVE_LCD_BITMAP */ extern void gui_synclist_init( struct gui_synclist * lists, @@ -179,7 +175,7 @@ extern bool gui_synclist_keyclick_callback(int action, void* data); extern bool gui_synclist_do_button(struct gui_synclist * lists, int *action, enum list_wrap); -#if defined(HAVE_LCD_BITMAP) && !defined(PLUGIN) +#if !defined(PLUGIN) struct listitem_viewport_cfg { struct wps_data *data; OFFSETTYPE(char *) label; @@ -204,7 +200,7 @@ enum themable_icons skinlist_get_item_icon(int offset, bool wrap); bool skinlist_needs_scrollbar(enum screen_type screen); void skinlist_get_scrollbar(int* nb_item, int* first_shown, int* last_shown); int skinlist_get_line_count(enum screen_type screen, struct gui_synclist *list); -#endif +#endif /* !PLUGIN) */ #if defined(HAVE_TOUCHSCREEN) /* this needs to be fixed if we ever get more than 1 touchscreen on a target */ -- cgit v1.2.3