diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/gui/bitmap/list-skinned.c | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[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
Diffstat (limited to 'apps/gui/bitmap/list-skinned.c')
-rw-r--r-- | apps/gui/bitmap/list-skinned.c | 6 |
1 files changed, 1 insertions, 5 deletions
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) | |||
236 | int cols = (parent->width / listcfg[screen]->width); | 236 | int cols = (parent->width / listcfg[screen]->width); |
237 | current_column = (cur_line)%cols; | 237 | current_column = (cur_line)%cols; |
238 | current_row = (cur_line)/cols; | 238 | current_row = (cur_line)/cols; |
239 | 239 | ||
240 | skin_viewport->vp.x = parent->x + listcfg[screen]->width*current_column + original_x; | 240 | skin_viewport->vp.x = parent->x + listcfg[screen]->width*current_column + original_x; |
241 | skin_viewport->vp.y = parent->y + listcfg[screen]->height*current_row + original_y; | 241 | skin_viewport->vp.y = parent->y + listcfg[screen]->height*current_row + original_y; |
242 | } | 242 | } |
@@ -249,7 +249,6 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) | |||
249 | (listcfg[screen]->height*cur_line); | 249 | (listcfg[screen]->height*cur_line); |
250 | } | 250 | } |
251 | display->set_viewport(&skin_viewport->vp); | 251 | display->set_viewport(&skin_viewport->vp); |
252 | #ifdef HAVE_LCD_BITMAP | ||
253 | /* Set images to not to be displayed */ | 252 | /* Set images to not to be displayed */ |
254 | struct skin_token_list *imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), wps.data->images); | 253 | struct skin_token_list *imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), wps.data->images); |
255 | while (imglist) | 254 | while (imglist) |
@@ -259,13 +258,10 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) | |||
259 | img->display = -1; | 258 | img->display = -1; |
260 | imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), imglist->next); | 259 | imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), imglist->next); |
261 | } | 260 | } |
262 | #endif | ||
263 | struct skin_element** children = SKINOFFSETTOPTR(get_skin_buffer(wps.data), viewport->children); | 261 | struct skin_element** children = SKINOFFSETTOPTR(get_skin_buffer(wps.data), viewport->children); |
264 | skin_render_viewport(SKINOFFSETTOPTR(get_skin_buffer(wps.data), (intptr_t)children[0]), | 262 | skin_render_viewport(SKINOFFSETTOPTR(get_skin_buffer(wps.data), (intptr_t)children[0]), |
265 | &wps, skin_viewport, SKIN_REFRESH_ALL); | 263 | &wps, skin_viewport, SKIN_REFRESH_ALL); |
266 | #ifdef HAVE_LCD_BITMAP | ||
267 | wps_display_images(&wps, &skin_viewport->vp); | 264 | wps_display_images(&wps, &skin_viewport->vp); |
268 | #endif | ||
269 | /* force disableing scroll because it breaks later */ | 265 | /* force disableing scroll because it breaks later */ |
270 | if (!is_selected) | 266 | if (!is_selected) |
271 | { | 267 | { |