Commit 5b253e9c authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu

xfns.c (Fx_show_tip): Subtract last glyph's width only when it is for padding.

parent 6eff5c3d
......@@ -9,7 +9,8 @@
TRY_WINDOW_CHECK_MARGINS.
* xfns.c (Fx_show_tip): Undo last change. Call try_window with
TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).
TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423). Subtract last glyph's
width only when it is for padding.
2010-04-09 Jan Djärv <jan.h.d@swipnet.se>
......
......@@ -5245,15 +5245,15 @@ Text larger than the specified size is clipped. */)
/* Let the row go over the full width of the frame. */
row->full_width_p = 1;
row_width = row->pixel_width;
/* There's a glyph at the end of rows that is used to place
the cursor there. Don't include the width of this glyph. */
if (row->used[TEXT_AREA])
{
last = &row->glyphs[TEXT_AREA][row->used[TEXT_AREA] - 1];
row_width = row->pixel_width - last->pixel_width;
if (INTEGERP (last->object))
row_width -= last->pixel_width;
}
else
row_width = row->pixel_width;
height += row->height;
width = max (width, row_width);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment