Commit 8a0484e1 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix display of tooltips damaged by enhancements for bug #11832.

 src/xdisp.c (init_iterator): Don't compute dimensions of truncation
 and continuation glyphs on tooltip frames, leave them at zero.
 Avoids displaying continued lines in tooltips.
parent fa691a83
2012-07-24 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (init_iterator): Don't compute dimensions of truncation
and continuation glyphs on tooltip frames, leave them at zero.
Avoids continued lines in tooltips. (Bug#11832)
2012-07-24 Dmitry Antipov <dmantipov@yandex.ru>
Simplify copy_overlay.
......
......@@ -2733,20 +2733,25 @@ init_iterator (struct it *it, struct window *w,
/* Get dimensions of truncation and continuation glyphs. These are
displayed as fringe bitmaps under X, but we need them for such
frames when the fringes are turned off. */
if (it->line_wrap == TRUNCATE)
frames when the fringes are turned off. But leave the dimensions
zero for tooltip frames, as these glyphs look ugly there and also
sabotage calculations of tooltip dimensions in x-show-tip. */
if (!(FRAMEP (tip_frame) && it->f == XFRAME (tip_frame)))
{
/* We will need the truncation glyph. */
eassert (it->glyph_row == NULL);
produce_special_glyphs (it, IT_TRUNCATION);
it->truncation_pixel_width = it->pixel_width;
}
else
{
/* We will need the continuation glyph. */
eassert (it->glyph_row == NULL);
produce_special_glyphs (it, IT_CONTINUATION);
it->continuation_pixel_width = it->pixel_width;
if (it->line_wrap == TRUNCATE)
{
/* We will need the truncation glyph. */
eassert (it->glyph_row == NULL);
produce_special_glyphs (it, IT_TRUNCATION);
it->truncation_pixel_width = it->pixel_width;
}
else
{
/* We will need the continuation glyph. */
eassert (it->glyph_row == NULL);
produce_special_glyphs (it, IT_CONTINUATION);
it->continuation_pixel_width = it->pixel_width;
}
}
/* Reset these values to zero because the produce_special_glyphs
......
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