procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2012-07-24 19:34:15 +03:00
parent fa691a83f0
commit 8a0484e105
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
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.

31
src/xdisp.c
View file

@ -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