Revert 23154.

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 363481195422a4edb65cced51cd19456ae12f5dd..e4e48d6c5226246c2bb955ace995a68c854f328c 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -71,17 +71,6 @@ RowPainter::RowPainter(PainterInfo & pi,
 
        BOOST_ASSERT(pit >= 0);
        BOOST_ASSERT(pit < int(text.paragraphs().size()));
-
-       // check for possible inline completion
-       DocIterator const & inlineCompletionPos = pi_.base.bv->inlineCompletionPos();
-       inlineCompletionVPos_ = -1;
-       if (inlineCompletionPos.inTexted()
-           && inlineCompletionPos.text() == &text_
-           && inlineCompletionPos.pit() == pit_) {
-               // draw visually behind the previous character
-               // FIXME: probably special RTL handling needed here
-               inlineCompletionVPos_ = bidi_.log2vis(inlineCompletionPos.pos() - 1);
-       }
 }
 
 
@@ -516,7 +505,7 @@ void RowPainter::paintFirst()
                FontInfo const font = getLabelFont();
                FontMetrics const & fm = theFontMetrics(font);
 
-               docstring const str = par_.getLabelstring();
+               docstring const str = par_.labelString();
                if (!str.empty()) {
                        double x = x_;
 
@@ -562,8 +551,8 @@ void RowPainter::paintFirst()
                layout->labeltype == LABEL_BIBLIO ||
                layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)) {
                FontInfo const font = getLabelFont();
-               if (!par_.getLabelstring().empty()) {
-                       docstring const str = par_.getLabelstring();
+               docstring const str = par_.labelString();
+               if (!str.empty()) {
                        double spacing_val = 1.0;
                        if (!parparams.spacing().isDefault())
                                spacing_val = parparams.spacing().getValue();
@@ -691,6 +680,18 @@ void RowPainter::paintText()
        bool is_struckout = false;
        int last_strikeout_x = 0;
 
+       // check for possible inline completion
+       DocIterator const & inlineCompletionPos = pi_.base.bv->inlineCompletionPos();
+       pos_type inlineCompletionVPos = -1;
+       if (inlineCompletionPos.inTexted()
+           && inlineCompletionPos.text() == &text_
+           && inlineCompletionPos.pit() == pit_
+           && inlineCompletionPos.pos() >= row_.pos()
+           && inlineCompletionPos.pos() <= row_.endpos()) {
+               // draw logically behind the previous character
+               inlineCompletionVPos = bidi_.log2vis(inlineCompletionPos.pos() - 1);
+       }
+
        // Use font span to speed things up, see below
        FontSpan font_span;
        Font font;
@@ -723,9 +724,9 @@ void RowPainter::paintText()
                        font = text_metrics_.getDisplayFont(pit_, vpos);
 
                        // split font span if inline completion is inside
-                       if (font_span.first <= inlineCompletionVPos_
-                           && font_span.last > inlineCompletionVPos_)
-                               font_span.last = inlineCompletionVPos_;
+                       if (font_span.first <= inlineCompletionVPos
+                           && font_span.last > inlineCompletionVPos)
+                               font_span.last = inlineCompletionVPos;
                }
 
                const int width_pos = pm_.singleWidth(pos, font);
@@ -765,6 +766,10 @@ void RowPainter::paintText()
 
                        x_ += row_.label_hfill + lwidth - width_pos;
                }
+               
+               // Is the inline completion in front of character?
+               if (font.isRightToLeft() && vpos == inlineCompletionVPos)
+                       paintInlineCompletion(font);
 
                if (par_.isSeparator(pos)) {
                        Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
@@ -786,31 +791,9 @@ void RowPainter::paintText()
                        paintFromPos(vpos);
                }
 
-               // Is the inline completion here?
-               // FIXME: RTL support needed here
-               if (vpos - 1 == inlineCompletionVPos_) {
-                       docstring const & completion = pi_.base.bv->inlineCompletion();
-                       FontInfo f = font.fontInfo();
-
-                       // draw the unique and the non-unique completion part
-                       // Note: this is not time-critical as it is
-                       // only done once per screen.
-                       size_t uniqueTo = pi_.base.bv->inlineCompletionUniqueChars();
-                       docstring s1 = completion.substr(0, uniqueTo);
-                       docstring s2 = completion.substr(uniqueTo);
-
-                       if (s1.size() > 0) {
-                               f.setColor(Color_inlinecompletion);
-                               pi_.pain.text(x_, yo_, s1, f);
-                               x_ += theFontMetrics(font).width(s1);
-                       }
-
-                       if (s2.size() > 0) {
-                               f.setColor(Color_nonunique_inlinecompletion);
-                               pi_.pain.text(x_, yo_, s2, f);
-                               x_ += theFontMetrics(font).width(s2);
-                       }
-               }
+               // Is the inline completion after character?
+               if (!font.isRightToLeft() && vpos - 1 == inlineCompletionVPos)
+                       paintInlineCompletion(font);
        }
 
        // if we reach the end of a struck out range, paint it
@@ -825,4 +808,34 @@ void RowPainter::paintText()
        }
 }
 
+
+void RowPainter::paintInlineCompletion(Font const & font)
+{
+       docstring completion = pi_.base.bv->inlineCompletion();
+       FontInfo f = font.fontInfo();
+       
+       // right to left?
+       if (font.isRightToLeft())
+               reverse(completion.begin(), completion.end());
+       
+       // draw the unique and the non-unique completion part
+       // Note: this is not time-critical as it is
+       // only done once per screen.
+       size_t uniqueTo = pi_.base.bv->inlineCompletionUniqueChars();
+       docstring s1 = completion.substr(0, uniqueTo);
+       docstring s2 = completion.substr(uniqueTo);
+       
+       if (s1.size() > 0) {
+               f.setColor(Color_inlinecompletion);
+               pi_.pain.text(x_, yo_, s1, f);
+               x_ += theFontMetrics(font).width(s1);
+       }
+       
+       if (s2.size() > 0) {
+               f.setColor(Color_nonunique_inlinecompletion);
+               pi_.pain.text(x_, yo_, s2, f);
+               x_ += theFontMetrics(font).width(s2);
+       }
+}
+
 } // namespace lyx