summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2006-10-20 23:12:21 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2006-10-20 23:12:21 +0000
commitdb0cc98aad95004c1cbced791d63d6254df57bd2 (patch)
treebde956fe3ba847e9613e1a7b2819dbb3da828d7a
parentcba6d102b1d7fc6e0a1fbee663ac15dfabafdd4c (diff)
downloadrockbox-db0cc98aad95004c1cbced791d63d6254df57bd2.tar.gz
rockbox-db0cc98aad95004c1cbced791d63d6254df57bd2.zip
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
-rw-r--r--apps/plugins/jpeg.c14
1 files 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)
2340void cb_progess(int current, int total) 2340void cb_progess(int current, int total)
2341{ 2341{
2342 rb->yield(); /* be nice to the other threads */ 2342 rb->yield(); /* be nice to the other threads */
2343 if(slideshow_enabled) 2343 if(!slideshow_enabled)
2344 { 2344 {
2345 /* in slideshow mode, keep gui interference to a minimum */ 2345 rb->scrollbar(0, LCD_HEIGHT-8, LCD_WIDTH, 8, total, 0,
2346 rb->scrollbar(0, LCD_HEIGHT-4, LCD_WIDTH, 4, total, 0,
2347 current, HORIZONTAL); 2346 current, HORIZONTAL);
2348 rb->lcd_update_rect(0, LCD_HEIGHT-4, LCD_WIDTH, 4); 2347 rb->lcd_update_rect(0, LCD_HEIGHT-8, LCD_WIDTH, 8);
2349 } 2348 }
2349#ifndef USEGSLIB
2350 else 2350 else
2351 { 2351 {
2352 rb->scrollbar(0, LCD_HEIGHT-8, LCD_WIDTH, 8, total, 0, 2352 /* in slideshow mode, keep gui interference to a minimum */
2353 rb->scrollbar(0, LCD_HEIGHT-4, LCD_WIDTH, 4, total, 0,
2353 current, HORIZONTAL); 2354 current, HORIZONTAL);
2354 rb->lcd_update_rect(0, LCD_HEIGHT-8, LCD_WIDTH, 8); 2355 rb->lcd_update_rect(0, LCD_HEIGHT-4, LCD_WIDTH, 4);
2355 } 2356 }
2357#endif
2356} 2358}
2357 2359
2358int jpegmem(struct jpeg *p_jpg, int ds) 2360int jpegmem(struct jpeg *p_jpg, int ds)