aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-05-02 20:02:55 +0000
committerGerd Moellmann2000-05-02 20:02:55 +0000
commitbdda7eb03333d00ba96f29d52cef712b38c3fcb1 (patch)
treea7ddd6329181b4ea6820473483cc9bd9da320da9 /src
parent95af8492a3f29dc8bfaeb6cfd4fb0edb478a885a (diff)
downloademacs-bdda7eb03333d00ba96f29d52cef712b38c3fcb1.tar.gz
emacs-bdda7eb03333d00ba96f29d52cef712b38c3fcb1.zip
(DEFAULT_IMAGE_HEIGHT): New macro.
(IMAGE_ASCENT): Removed.
Diffstat (limited to 'src')
-rw-r--r--src/dispextern.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index ad32c70360f..c5dd55b3a98 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1917,9 +1917,12 @@ struct image
1917#define DEFAULT_IMAGE_WIDTH 30 1917#define DEFAULT_IMAGE_WIDTH 30
1918#define DEFAULT_IMAGE_HEIGHT 30 1918#define DEFAULT_IMAGE_HEIGHT 30
1919 1919
1920 /* Percent of image height used as ascent. */ 1920 /* Percent of image height used as ascent. A value of
1921 CENTERED_IMAGE_ASCENT means draw center the image centered on the
1922 line. */
1921 int ascent; 1923 int ascent;
1922#define DEFAULT_IMAGE_ASCENT 50 1924#define DEFAULT_IMAGE_ASCENT 50
1925#define CENTERED_IMAGE_ASCENT -1
1923 1926
1924 /* Lisp specification of this image. */ 1927 /* Lisp specification of this image. */
1925 Lisp_Object spec; 1928 Lisp_Object spec;
@@ -1980,11 +1983,6 @@ struct image_cache
1980}; 1983};
1981 1984
1982 1985
1983/* Value is the ascent of image IMG. */
1984
1985#define IMAGE_ASCENT(IMG) \
1986 (((IMG)->height + (IMG)->margin) * (IMG)->ascent / 100.0)
1987
1988/* Value is a pointer to the image with id ID on frame F, or null if 1986/* Value is a pointer to the image with id ID on frame F, or null if
1989 no image with that id exists. */ 1987 no image with that id exists. */
1990 1988