summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2012-01-15 10:55:52 +0800
committerChong Yidong <cyd@gnu.org>2012-01-15 10:55:52 +0800
commiteb74c659d5529b14c7f3aad4b51e39161178fea7 (patch)
tree43962ccaf3f8c815ab5ba973156482d33da17b29
parent76e47e3d6f3a6b71cb9822e4ac027df58302b1e2 (diff)
downloademacs-eb74c659d5529b14c7f3aad4b51e39161178fea7.tar.gz
Fix wrong font metrics for mouse highlight (backport 2011-12-15T02:12:08Z!handa@m17n.org from trunk)
* src/xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background (Bug#8992).
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xftfont.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8d784e1fa90..2238c1b8bfd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
+
+ * xftfont.c (xftfont_draw): Use the font metrics of s->font to
+ fill background (Bug#8992).
+
2012-01-13 Kenichi Handa <handa@m17n.org>
* character.c (char_width): New function.
diff --git a/src/xftfont.c b/src/xftfont.c
index 935a7319a60..aa31fd9d868 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -689,7 +689,7 @@ xftfont_draw (s, from, to, x, y, with_background)
if (with_background)
XftDrawRect (xft_draw, &bg,
- x, y - face->font->ascent, s->width, face->font->height);
+ x, y - s->font->ascent, s->width, s->font->height);
code = alloca (sizeof (FT_UInt) * len);
for (i = 0; i < len; i++)
code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8)