From db0cc98aad95004c1cbced791d63d6254df57bd2 Mon Sep 17 00:00:00 2001 From: Peter D'Hoye Date: Fri, 20 Oct 2006 23:12:21 +0000 Subject: Don't try to show the progress bar on top of the picture on grayscale lib targets git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11280 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/jpeg.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 35930f78a7..ce2f55cb24 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c @@ -2340,19 +2340,21 @@ int scroll_bmp(struct t_disp* pdisp) void cb_progess(int current, int total) { rb->yield(); /* be nice to the other threads */ - if(slideshow_enabled) + if(!slideshow_enabled) { - /* in slideshow mode, keep gui interference to a minimum */ - rb->scrollbar(0, LCD_HEIGHT-4, LCD_WIDTH, 4, total, 0, + rb->scrollbar(0, LCD_HEIGHT-8, LCD_WIDTH, 8, total, 0, current, HORIZONTAL); - rb->lcd_update_rect(0, LCD_HEIGHT-4, LCD_WIDTH, 4); + rb->lcd_update_rect(0, LCD_HEIGHT-8, LCD_WIDTH, 8); } +#ifndef USEGSLIB else { - rb->scrollbar(0, LCD_HEIGHT-8, LCD_WIDTH, 8, total, 0, + /* in slideshow mode, keep gui interference to a minimum */ + rb->scrollbar(0, LCD_HEIGHT-4, LCD_WIDTH, 4, total, 0, current, HORIZONTAL); - rb->lcd_update_rect(0, LCD_HEIGHT-8, LCD_WIDTH, 8); + rb->lcd_update_rect(0, LCD_HEIGHT-4, LCD_WIDTH, 4); } +#endif } int jpegmem(struct jpeg *p_jpg, int ds) -- cgit v1.2.3