Force redraw after completion

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index 4b9836edff3a19bc6d55f88ec8eb128e2f3635f4..f2d4aafe85be45993ff7322888a994354a5b068f 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -114,6 +114,7 @@ pos_type Row::Element::x2pos(int &x) const
                break;
        case INSET:
        case SPACE:
+       case MARGINSPACE:
                // those elements contain only one position. Round to
                // the closest side.
                if (x > (full_width() + 1) / 2) {
@@ -162,10 +163,17 @@ bool Row::Element::splitAt(int const width, int next_width, bool force,
        bool first = true;
        docstring::size_type i = 0;
        for (FontMetrics::Break const & brk : breaks) {
+               /* For some reason breakString can decide to break before the
+                * first character (normally we use a 0-width nbsp to prevent
+                * that). Skip leading empty elements, they are never wanted.
+                */
+               if (first && brk.len == 0 && breaks.size() > 1)
+                       continue;
                Element e(STRING, pos + i, font, change);
                e.str = str.substr(i, brk.len);
                e.endpos = e.pos + brk.len;
                e.dim.wid = brk.wid;
+               e.nspc_wid = brk.nspc_wid;
                e.row_flags = CanBreakInside | BreakAfter;
                if (first) {
                        // this element eventually goes to *this
@@ -212,6 +220,7 @@ void Row::Element::rtrim()
         */
        str = support::rtrim(str);
        endpos = pos + str.length();
+       dim.wid = nspc_wid;
 }
 
 
@@ -305,6 +314,9 @@ ostream & operator<<(ostream & os, Row::Element const & e)
                break;
        case Row::SPACE:
                os << "SPACE: ";
+               break;
+       case Row::MARGINSPACE:
+               os << "MARGINSPACE: ";
        }
        os << "width=" << e.full_width() << ", row_flags=" << e.row_flags;
        return os;
@@ -332,7 +344,8 @@ ostream & operator<<(ostream & os, Row const & row)
           << " descent: " << row.dim_.des
           << " separator: " << row.separator
           << " label_hfill: " << row.label_hfill
-          << " row_boundary: " << row.right_boundary() << "\n";
+          << " right_boundary: " << row.right_boundary()
+          << " flushed: " << row.flushed() << "\n";
        // We cannot use the operator above, unfortunately
        double x = row.left_margin;
        for (Row::Element const & e : row.elements_) {
@@ -447,12 +460,12 @@ void Row::add(pos_type const pos, Inset const * ins, Dimension const & dim,
 
 
 void Row::add(pos_type const pos, char_type const c,
-              Font const & f, Change const & ch, bool can_break)
+              Font const & f, Change const & ch)
 {
        if (!sameString(f, ch)) {
                finalizeLast();
                Element e(STRING, pos, f, ch);
-               e.row_flags = can_break ? CanBreakInside : Inline;
+               e.row_flags = CanBreakInside;
                elements_.push_back(e);
        }
        back().str += c;
@@ -489,6 +502,18 @@ void Row::addSpace(pos_type const pos, int const width,
 }
 
 
+void Row::addMarginSpace(pos_type const pos, int const width,
+                  Font const & f, Change const & ch)
+{
+       finalizeLast();
+       Element e(MARGINSPACE, pos, f, ch);
+       e.dim.wid = width;
+       e.row_flags = NoBreakBefore;
+       elements_.push_back(e);
+       dim_.wid += e.dim.wid;
+}
+
+
 void Row::push_back(Row::Element const & e)
 {
        dim_.wid += e.dim.wid;
@@ -512,7 +537,7 @@ void moveElements(Row::Elements & from, Row::Elements::iterator const & it,
        to.insert(to.end(), it, from.end());
        from.erase(it, from.end());
        if (!from.empty())
-               from.back().row_flags = (from.back().row_flags & ~AfterFlags) | BreakAfter;
+               from.back().row_flags = (from.back().row_flags & ~AfterFlags) | AlwaysBreakAfter;
 }
 
 }
@@ -579,6 +604,7 @@ Row::Elements Row::shortenIfNeeded(int const w, int const next_width)
                         */
                        if (wid_brk + cit_brk->dim.wid < w
                            && dim_.wid - (wid_brk + brk.dim.wid) >= next_width) {
+                               tail.clear();
                                break;
                        }
                        end_ = brk.endpos;
@@ -612,7 +638,6 @@ Row::Elements Row::shortenIfNeeded(int const w, int const next_width)
         * splitting this time.
         */
        if (cit->splitAt(w - wid, next_width, true, tail)) {
-               LYXERR0(*cit);
                end_ = cit->endpos;
                dim_.wid = wid + cit->dim.wid;
                // If there are other elements, they should be removed.
@@ -620,7 +645,9 @@ Row::Elements Row::shortenIfNeeded(int const w, int const next_width)
                return tail;
        }
 
-       return Elements();
+       // cit == beg; remove all elements after the first one.
+       moveElements(elements_, cit + 1, tail);
+       return tail;
 }