This is the first of a series of commits that will make InsetLayout a real class.

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 78c17a8adba635c085af309388bb56f85ab9e374..363481195422a4edb65cced51cd19456ae12f5dd 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -17,7 +17,6 @@
 #include "Buffer.h"
 #include "CoordCache.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Changes.h"
@@ -40,6 +39,7 @@
 
 #include "insets/InsetText.h"
 
+#include "support/debug.h"
 #include "support/textutils.h"
 
 #include <boost/crc.hpp>
@@ -71,6 +71,17 @@ 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);
+       }
 }
 
 
@@ -610,12 +621,14 @@ void RowPainter::paintLast()
                FontMetrics const & fm = theFontMetrics(font);
                int const size = int(0.75 * fm.maxAscent());
                int const y = yo_ - size;
-               int x = is_rtl ? nestMargin() + changebarMargin() : width_
-                       - text_metrics_.rightMargin(pm_) - size - Inset::TEXT_TO_INSET_OFFSET;
+               int const max_row_width = width_ - size - Inset::TEXT_TO_INSET_OFFSET;
+               int x = is_rtl ? nestMargin() + changebarMargin()
+                       : max_row_width - text_metrics_.rightMargin(pm_);
 
-               int const rem = width_ - row_.width() - size;
+               // If needed, move the box a bit to avoid overlapping with text.
+               int const rem = max_row_width - row_.width();
                if (rem <= 0)
-                       x += rem * (is_rtl ? 1 : -1);
+                       x += is_rtl ? rem : - rem;
 
                if (endlabel == END_LABEL_BOX)
                        pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
@@ -645,15 +658,12 @@ void RowPainter::paintOnlyInsets()
 {
        pos_type const end = row_.endpos();
        for (pos_type pos = row_.pos(); pos != end; ++pos) {
-               if (!par_.isInset(pos))
-                       continue;
-
                // If outer row has changed, nested insets are repaint completely.
                Inset const * inset = par_.getInset(pos);
-
+               if (!inset)
+                       continue;
                if (x_ > pi_.base.bv->workWidth())
                        continue;
-
                x_ = pi_.base.bv->coordCache().getInsets().x(inset);
                paintInset(inset, pos);
        }
@@ -689,7 +699,7 @@ void RowPainter::paintText()
        // it's in the last row of a paragraph; see skipped_sep_vpos declaration
        if (end > 0 && end < par_.size() && par_.isSeparator(end - 1))
                skipped_sep_vpos = bidi_.log2vis(end - 1);
-       
+
        for (pos_type vpos = row_.pos(); vpos < end; ) {
                if (x_ > pi_.base.bv->workWidth())
                        break;
@@ -711,6 +721,11 @@ void RowPainter::paintText()
                if (vpos < font_span.first || vpos > font_span.last) {
                        font_span = par_.fontSpan(vpos);
                        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_;
                }
 
                const int width_pos = pm_.singleWidth(pos, font);
@@ -728,8 +743,9 @@ void RowPainter::paintText()
                        last_strikeout_x = int(x_);
                }
 
-               bool const highly_editable_inset = par_.isInset(pos)
-                       && par_.getInset(pos)->editable() == Inset::HIGHLY_EDITABLE;
+               Inset const * inset = par_.getInset(pos);
+               bool const highly_editable_inset = inset
+                       && inset->editable() == Inset::HIGHLY_EDITABLE;
 
                // If we reach the end of a struck out range, paint it.
                // We also don't paint across things like tables
@@ -759,9 +775,8 @@ void RowPainter::paintText()
                        paintForeignMark(orig_x, orig_font.language());
                        ++vpos;
 
-               } else if (par_.isInset(pos)) {
+               } else if (inset) {
                        // If outer row has changed, nested insets are repaint completely.
-                       Inset const * inset = par_.getInset(pos);
                        pi_.base.bv->coordCache().insets().add(inset, int(x_), yo_);
                        paintInset(inset, pos);
                        ++vpos;
@@ -770,6 +785,32 @@ void RowPainter::paintText()
                        // paint as many characters as possible.
                        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);
+                       }
+               }
        }
 
        // if we reach the end of a struck out range, paint it