Correct Right Arrow key processing in Modules list

[lyx.git] / src / Row.cpp

diff --git a/src/Row.cpp b/src/Row.cpp
index 8ca6112d15c7f6a94832f7a8e1d618582b2988a6..f59b6e41afdd358485ef9ebfc414efb9482a6245 100644 (file)
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -480,6 +480,18 @@ bool Row::shortenIfNeeded(pos_type const keep, int const w, int const next_width
                --cit_brk;
                // make a copy of the element to work on it.
                Element brk = *cit_brk;
+               /* If the current element is an inset that allows breaking row
+                * after itself, and it the row is already short enough after
+                * this inset, then cut right after this element.
+                */
+               if (wid_brk <= w && brk.type == INSET
+                   && brk.inset->rowFlags() & Inset::CanBreakAfter) {
+                       end_ = brk.endpos;
+                       dim_.wid = wid_brk;
+                       elements_.erase(cit_brk + 1, end);
+                       return true;
+               }
+               // assume now that the current element is not there
                wid_brk -= brk.dim.wid;
                /*
                 * Some Asian languages split lines anywhere (no notion of