anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* correct color for the unique part of the completion in RTL

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23315 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stefan Schimanski 2008-02-28 12:42:58 +00:00
parent 7271db36c5
commit f7cd0928ad
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/rowpainter.cpp
View File

@ -813,10 +813,7 @@ void RowPainter::paintInlineCompletion(Font const & font)
{ {
docstring completion = pi_.base.bv->inlineCompletion(); docstring completion = pi_.base.bv->inlineCompletion();
FontInfo f = font.fontInfo(); FontInfo f = font.fontInfo();
bool rtl = font.isRightToLeft();
// right to left?
if (font.isRightToLeft())
reverse(completion.begin(), completion.end());
// draw the unique and the non-unique completion part // draw the unique and the non-unique completion part
// Note: this is not time-critical as it is // Note: this is not time-critical as it is
@ -824,15 +821,25 @@ void RowPainter::paintInlineCompletion(Font const & font)
size_t uniqueTo = pi_.base.bv->inlineCompletionUniqueChars(); size_t uniqueTo = pi_.base.bv->inlineCompletionUniqueChars();
docstring s1 = completion.substr(0, uniqueTo); docstring s1 = completion.substr(0, uniqueTo);
docstring s2 = completion.substr(uniqueTo); docstring s2 = completion.substr(uniqueTo);
ColorCode c1 = Color_inlinecompletion;
ColorCode c2 = Color_nonunique_inlinecompletion;
// right to left?
if (rtl) {
swap(s1, s2);
reverse(s1.begin(), s1.end());
reverse(s2.begin(), s2.end());
swap(c1, c2);
}
if (s1.size() > 0) { if (s1.size() > 0) {
f.setColor(Color_inlinecompletion); f.setColor(c1);
pi_.pain.text(int(x_), yo_, s1, f); pi_.pain.text(int(x_), yo_, s1, f);
x_ += theFontMetrics(font).width(s1); x_ += theFontMetrics(font).width(s1);
} }
if (s2.size() > 0) { if (s2.size() > 0) {
f.setColor(Color_nonunique_inlinecompletion); f.setColor(c2);
pi_.pain.text(int(x_), yo_, s2, f); pi_.pain.text(int(x_), yo_, s2, f);
x_ += theFontMetrics(font).width(s2); x_ += theFontMetrics(font).width(s2);
} }