branch: Fix bug #2972: Static EndLabelStrings were not painted correctly.

see r30962 and r31205.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31700 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-10-24 10:32:26 +00:00
parent 3eca176727
commit 9610852f65
2 changed files with 4 additions and 3 deletions

View File

@ -660,9 +660,7 @@ void RowPainter::paintLast()
FontInfo const font = labelFont();
FontMetrics const & fm = theFontMetrics(font);
docstring const & str = par_.layout().endlabelstring();
double const x = is_rtl ?
x_ - fm.width(str)
: - text_metrics_.rightMargin(pm_) - row_.width();
double const x = is_rtl ? x_ - fm.width(str) : x_;
pi_.pain.text(int(x), yo_, str, font);
break;
}

View File

@ -226,6 +226,9 @@ What's new
- Fix inset-[begin|end][-select] when the cursor is at the beginning or
end of a paragraph.
- If a static EndLabelString is defined in a layout file it is now
correctly displayed on screen (bug 2972).
* DOCUMENTATION AND LOCALIZATION