Merge branch '2.2.x' of git.lyx.org:lyx into 2.2.x

This commit is contained in:
Uwe Stöhr 2016-07-26 23:40:34 +02:00
commit 5e6f9d1753

View File

@ -587,7 +587,7 @@ void RowPainter::paintOnlyInsets()
x_ += e.full_width();
continue;
}
int orig_x = x_;
double orig_x = x_;
paintInset(e.inset, e.font, e.change, e.pos);
// The line that indicates word in a different language
paintForeignMark(orig_x, e.font.language(), e.dim.descent());