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/bitmap/list-skinned.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'apps/gui/bitmap/list-skinned.c') diff --git a/apps/gui/bitmap/list-skinned.c b/apps/gui/bitmap/list-skinned.c index d6b868ae26..f0396263f3 100644 --- a/apps/gui/bitmap/list-skinned.c +++ b/apps/gui/bitmap/list-skinned.c @@ -236,7 +236,7 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) int cols = (parent->width / listcfg[screen]->width); current_column = (cur_line)%cols; current_row = (cur_line)/cols; - + skin_viewport->vp.x = parent->x + listcfg[screen]->width*current_column + original_x; skin_viewport->vp.y = parent->y + listcfg[screen]->height*current_row + original_y; } @@ -249,7 +249,6 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) (listcfg[screen]->height*cur_line); } display->set_viewport(&skin_viewport->vp); -#ifdef HAVE_LCD_BITMAP /* Set images to not to be displayed */ struct skin_token_list *imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), wps.data->images); while (imglist) @@ -259,13 +258,10 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) img->display = -1; imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), imglist->next); } -#endif struct skin_element** children = SKINOFFSETTOPTR(get_skin_buffer(wps.data), viewport->children); skin_render_viewport(SKINOFFSETTOPTR(get_skin_buffer(wps.data), (intptr_t)children[0]), &wps, skin_viewport, SKIN_REFRESH_ALL); -#ifdef HAVE_LCD_BITMAP wps_display_images(&wps, &skin_viewport->vp); -#endif /* force disableing scroll because it breaks later */ if (!is_selected) { -- cgit v1.2.3