projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.31.tar.gz
[xscreensaver]
/
hacks
/
glx
/
photopile.c
diff --git
a/hacks/glx/photopile.c
b/hacks/glx/photopile.c
index aa52d162e5e816d3269b561a7e9101561e6b9aa4..671ca13843923dfa80875fdc2dde0ea474ab38d0 100644
(file)
--- a/
hacks/glx/photopile.c
+++ b/
hacks/glx/photopile.c
@@
-11,7
+11,7
@@
* implied warranty.
*/
* implied warranty.
*/
-#define DEF_FONT "-*-helvetica-bold-r-normal-*-
240
-*"
+#define DEF_FONT "-*-helvetica-bold-r-normal-*-
*-480-*-*-*-*-*
-*"
#define DEFAULTS "*count: 7 \n" \
"*delay: 10000 \n" \
"*wireframe: False \n" \
#define DEFAULTS "*count: 7 \n" \
"*delay: 10000 \n" \
"*wireframe: False \n" \
@@
-630,7
+630,7
@@
draw_image (ModeInfo *mi, int i, GLfloat t, GLfloat s, GLfloat z)
if (titles_p)
{
int sw, sh;
if (titles_p)
{
int sw, sh;
- GLfloat scale =
0.6
;
+ GLfloat scale =
1
;
const char *title = frame->title ? frame->title : "(untitled)";
/* #### Highly approximate, but doing real clipping is harder... */
const char *title = frame->title ? frame->title : "(untitled)";
/* #### Highly approximate, but doing real clipping is harder... */
@@
-640,6
+640,8
@@
draw_image (ModeInfo *mi, int i, GLfloat t, GLfloat s, GLfloat z)
sw = texture_string_width (ss->texfont, title, &sh);
sw = texture_string_width (ss->texfont, title, &sh);
+ sh *= (polaroid_p ? 2.2 : 1.4); /* move text down from the photo */
+
glTranslatef (-sw*scale*0.5, -h - sh*scale, z);
glScalef (scale, scale, 1);
glTranslatef (-sw*scale*0.5, -h - sh*scale, z);
glScalef (scale, scale, 1);