projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://se.aminet.net/pub/Linux/distributions/slackware/slackware-10.1/source/xap...
[xscreensaver]
/
hacks
/
glx
/
glslideshow.c
diff --git
a/hacks/glx/glslideshow.c
b/hacks/glx/glslideshow.c
index d735e7bd5e3514010a9f41981587dfe45d4a3aa1..51817877a6e3820e9562cf44e1a060728b5c0cdd 100644
(file)
--- a/
hacks/glx/glslideshow.c
+++ b/
hacks/glx/glslideshow.c
@@
-846,6
+846,9
@@
sanity_check (ModeInfo *mi)
if (zoom < 1) zoom = 1; /* zoom is a positive percentage */
else if (zoom > 100) zoom = 100;
if (zoom < 1) zoom = 1; /* zoom is a positive percentage */
else if (zoom > 100) zoom = 100;
+ if (zoom == 100) /* with no zooming, there is no panning */
+ pan_seconds = 0;
+
if (pan_seconds < fade_seconds) /* pan is inclusive of fade */
pan_seconds = fade_seconds;
if (pan_seconds < fade_seconds) /* pan is inclusive of fade */
pan_seconds = fade_seconds;
@@
-956,6
+959,8
@@
init_slideshow (ModeInfo *mi)
load_quad (mi, &ss->quads[0]);
ss->quads[0].state = IN;
load_quad (mi, &ss->quads[0]);
ss->quads[0].state = IN;
+ ss->image_start_time -= pan_seconds; /* fudge needed for first image */
+
ss->redisplay_needed_p = True;
ss->fork_p = 0; /* #### buggy */
ss->redisplay_needed_p = True;
ss->fork_p = 0; /* #### buggy */