Revert "Fixup 0cbe0d7a: avoid double redraw when completion is finished"

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index fea9a38943ef3083c26eaddfd69a5a7eb4cc3c66..102b1ea4ae9df206947a3d8fea66037cd7879c65 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -144,8 +144,12 @@ bool Row::Element::splitAt(int const width, int next_width, bool force,
        FontMetrics::Breaks breaks = fm.breakString(str, width, next_width,
                                                 isRTL(), wrap_any | force);
 
-       // if breaking did not really work, give up
-       if (!force && breaks.front().nspc_wid > width) {
+       /** if breaking did not really work, give up
+        * case 1: we do not force break and the first element is longer than the limit;
+        * case 2: the first break occurs at the front of the string
+        */
+       if ((!force && breaks.front().nspc_wid > width)
+           || (breaks.size() > 1 && breaks.front().len == 0)) {
                if (dim.wid == 0)
                        dim.wid = fm.width(str);
                return false;
@@ -156,12 +160,6 @@ 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;
@@ -191,8 +189,20 @@ bool Row::Element::splitAt(int const width, int next_width, bool force,
                // first_e row should be broken after the original element
                first_e.row_flags |= BreakAfter;
        } else {
-               // Restore the after flags of the original element.
+#if 1
+               // remove the BreakAfter that got added above.
                first_e.row_flags &= ~BreakAfter;
+#else
+               // FIXME : the code below looks like a good idea, but I do not
+               //         have a use case yet. The question is what happens
+               //         when breaking at the end of a string with a
+               //         trailing space.
+               // if it turns out that no breaking was necessary, remove the
+               // BreakAfter that got added above.
+               if (first_e.dim.wid <= width)
+                       first_e.row_flags &= ~BreakAfter;
+#endif
+               // Restore the after flags of the original element.
                first_e.row_flags |= row_flags & AfterFlags;
        }