aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

Improve positioning of combining characters in GTK.

Browse Source
This commit is contained in:
Bram Moolenaar 2010-08-08 14:40:37 +02:00
parent 2d231cb89c
commit 96118f3e38
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui_gtk_x11.c
View File

@ -5109,13 +5109,20 @@ not_ascii:
/* There is a previous glyph, so we deal with combining /* There is a previous glyph, so we deal with combining
* characters the canonical way. * characters the canonical way.
* Older versions of Pango used a positive x_offset, * In some circumstances Pango uses a positive x_offset,
* then set the width of the previous glyph to zero. * then use the width of the previous glyph for this one
* Newer versions of Pango use a negative x_offset. * and set the previous width to zero.
* Otherwise we get a negative x_offset, Pango has already
* positioned the combining char, keep the widths as they
* are.
* For both adjust the x_offset to position the glyph in * For both adjust the x_offset to position the glyph in
* the middle. */ * the middle. */
if (glyph->geometry.x_offset >= 0) if (glyph->geometry.x_offset >= 0)
{
glyphs->glyphs[i].geometry.width =
glyphs->glyphs[i - 1].geometry.width;
glyphs->glyphs[i - 1].geometry.width = 0; glyphs->glyphs[i - 1].geometry.width = 0;
}
width = cells * gui.char_width * PANGO_SCALE; width = cells * gui.char_width * PANGO_SCALE;
glyph->geometry.x_offset += glyph->geometry.x_offset +=
MAX(0, width - cluster_width) / 2; MAX(0, width - cluster_width) / 2;