Revert 23154.

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index dec29054f37f566719797a62dea35e067fe7e147..a9ce0f04dc7321b9f232e0152e888f33f97b9eb9 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -732,13 +732,12 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
 
        // check for possible inline completion
        DocIterator const & inlineCompletionPos = bv_->inlineCompletionPos();
-       pos_type inlineCompletionVPos = -1;
+       pos_type inlineCompletionLPos = -1;
        if (inlineCompletionPos.inTexted()
            && inlineCompletionPos.text() == text_
            && inlineCompletionPos.pit() == pit) {
-               // draw visually behind the previous character
-               // FIXME: probably special RTL handling needed here
-               inlineCompletionVPos = inlineCompletionPos.pos() - 1;
+               // draw logically behind the previous character
+               inlineCompletionLPos = inlineCompletionPos.pos() - 1;
        }
 
        // Now we iterate through until we reach the right margin
@@ -759,7 +758,7 @@ pit_type TextMetrics::rowBreakPoint(int width, pit_type const pit,
                int thiswidth = pm.singleWidth(i, *fi);
 
                // add inline completion width
-               if (inlineCompletionVPos == i) {
+               if (inlineCompletionLPos == i) {
                        docstring const & completion = bv_->inlineCompletion();
                        if (completion.length() > 0)
                                thiswidth += theFontMetrics(*fi).width(completion);
@@ -849,13 +848,12 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
 
        // check for possible inline completion
        DocIterator const & inlineCompletionPos = bv_->inlineCompletionPos();
-       pos_type inlineCompletionVPos = -1;
+       pos_type inlineCompletionLPos = -1;
        if (inlineCompletionPos.inTexted()
            && inlineCompletionPos.text() == text_
            && inlineCompletionPos.pit() == pit) {
-               // draw visually behind the previous character
-               // FIXME: probably special RTL handling needed here
-               inlineCompletionVPos = inlineCompletionPos.pos() - 1;
+               // draw logically behind the previous character
+               inlineCompletionLPos = inlineCompletionPos.pos() - 1;
        }
 
        pos_type const body_pos = par.beginOfBody();
@@ -875,7 +873,7 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit,
                        w += pm.singleWidth(i, *fi);
 
                        // add inline completion width
-                       if (inlineCompletionVPos == i) {
+                       if (inlineCompletionLPos == i) {
                                docstring const & completion = bv_->inlineCompletion();
                                if (completion.length() > 0)
                                        w += theFontMetrics(*fi).width(completion);
@@ -1000,7 +998,7 @@ Dimension TextMetrics::rowHeight(pit_type const pit, pos_type const first,
                     || layout->labeltype == LABEL_BIBLIO
                     || layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
                    && isFirstInSequence(pit, pars)
-                   && !par.getLabelstring().empty())
+                   && !par.labelString().empty())
                {
                        labeladdon = int(
                                  labelfont_metrics.maxHeight()
@@ -1528,6 +1526,18 @@ int TextMetrics::cursorX(CursorSlice const & sl,
            (body_pos > end || !par.isLineSeparator(body_pos - 1)))
                body_pos = 0;
 
+       // check for possible inline completion in this row
+       DocIterator const & inlineCompletionPos = bv_->inlineCompletionPos();
+       pos_type inlineCompletionVPos = -1;
+       if (inlineCompletionPos.inTexted()
+           && inlineCompletionPos.text() == text_
+           && inlineCompletionPos.pit() == pit
+           && inlineCompletionPos.pos() >= row_pos
+           && inlineCompletionPos.pos() <= end) {
+               // 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;
@@ -1537,6 +1547,15 @@ int TextMetrics::cursorX(CursorSlice const & sl,
        if (end > 0 && end < par.size() && par.isSeparator(end - 1))
                skipped_sep_vpos = bidi.log2vis(end - 1);
        
+       // Inline completion RTL special case row_pos == cursor_pos:
+       // "__|b" => cursor_pos is right of __
+       if (row_pos == inlineCompletionVPos && row_pos == cursor_vpos) {
+               font = getDisplayFont(pit, row_pos + 1);
+               docstring const & completion = bv_->inlineCompletion();
+               if (font.isRightToLeft() && completion.length() > 0)
+                       x += theFontMetrics(font.fontInfo()).width(completion);
+       }
+       
        for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
                // Skip the separator which is at the logical end of the row
                if (vpos == skipped_sep_vpos)
@@ -1558,6 +1577,26 @@ int TextMetrics::cursorX(CursorSlice const & sl,
 
                x += pm.singleWidth(pos, font);
 
+               // Inline completion RTL case:
+               // "a__|b", __ of b => non-boundary a-pos is right of __
+               if (vpos + 1 == inlineCompletionVPos 
+                   && (vpos + 1 < cursor_vpos || !boundary_correction)) {
+                       font = getDisplayFont(pit, vpos + 1);
+                       docstring const & completion = bv_->inlineCompletion();
+                       if (font.isRightToLeft() && completion.length() > 0)
+                               x += theFontMetrics(font.fontInfo()).width(completion);
+               }
+               
+               //  Inline completion LTR case:
+               // "b|__a", __ of b => non-boundary a-pos is in front of __
+               if (vpos == inlineCompletionVPos
+                   && (vpos + 1 < cursor_vpos || boundary_correction)) {
+                       font = getDisplayFont(pit, vpos);
+                       docstring const & completion = bv_->inlineCompletion();
+                       if (!font.isRightToLeft() && completion.length() > 0)
+                               x += theFontMetrics(font.fontInfo()).width(completion);
+               }
+               
                if (par.isSeparator(pos) && pos >= body_pos)
                        x += row.separator;
        }
@@ -1771,9 +1810,9 @@ int TextMetrics::leftMargin(int max_width,
                        l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
                                layout->leftmargin);
                }
-               if (!par.getLabelstring().empty()) {
+               if (!par.labelString().empty()) {
                        l_margin += labelfont_metrics.signedWidth(layout->labelindent);
-                       l_margin += labelfont_metrics.width(par.getLabelstring());
+                       l_margin += labelfont_metrics.width(par.labelString());
                        l_margin += labelfont_metrics.width(layout->labelsep);
                }
                break;
@@ -1817,7 +1856,7 @@ int TextMetrics::leftMargin(int max_width,
                           LABEL_CENTERED_TOP_ENVIRONMENT) {
                        l_margin += labelfont_metrics.signedWidth(layout->labelindent);
                        l_margin += labelfont_metrics.width(layout->labelsep);
-                       l_margin += labelfont_metrics.width(par.getLabelstring());
+                       l_margin += labelfont_metrics.width(par.labelString());
                }
                break;