Revert 23154.

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 40af9b99d7278e813bc123da317c380a6045bb1d..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);
@@ -767,8 +768,8 @@ void RowPainter::paintText()
                }
                
                // Is the inline completion in front of character?
-               if (font.isRightToLeft() && vpos == inlineCompletionVPos_)
-                       paintInlineCompletion(font);            
+               if (font.isRightToLeft() && vpos == inlineCompletionVPos)
+                       paintInlineCompletion(font);
 
                if (par_.isSeparator(pos)) {
                        Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
@@ -791,7 +792,7 @@ void RowPainter::paintText()
                }
 
                // Is the inline completion after character?
-               if (!font.isRightToLeft() && vpos - 1 == inlineCompletionVPos_)
+               if (!font.isRightToLeft() && vpos - 1 == inlineCompletionVPos)
                        paintInlineCompletion(font);
        }