* GuiToolbar.cpp:

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index c1965cb5ee4d41ff3ffd7f37ddbbd2475be56a53..9ca701d2d46786d5bbbfa7882be753b363a8818f 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -49,7 +49,7 @@
 
 #include "support/debug.h"
 #include <cstdlib>
-#include "support/assert.h"
+#include "support/lassert.h"
 
 using namespace std;
 
@@ -1784,7 +1784,7 @@ int TextMetrics::leftMargin(int max_width,
                                l_margin = leftMargin(max_width, newpar);
                        }
                        if (tclass.isDefaultLayout(par.layout())
-                           || tclass.isEmptyLayout(par.layout())) {
+                           || tclass.isPlainLayout(par.layout())) {
                                if (pars[newpar].params().noindent())
                                        parindent.erase();
                                else
@@ -1905,8 +1905,8 @@ int TextMetrics::leftMargin(int max_width,
            && !(!par.empty()
                    && par.isInset(pos)
                    && par.getInset(pos)->display())
-                       && ((tclass.isDefaultLayout(par.layout())
-                || tclass.isEmptyLayout(par.layout()))
+                       && (!(tclass.isDefaultLayout(par.layout())
+                || tclass.isPlainLayout(par.layout()))
                || buffer.params().paragraph_separation == BufferParams::ParagraphIndentSeparation)
            )
        {
@@ -2033,6 +2033,10 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
                        beg.pos() = row.sel_beg;
                        end.pit() = pit;
                        end.pos() = row.sel_end;
+                       if (end.pos() == row.endpos()) {
+                               // selection goes till the end of the row.
+                               end.boundary(true);
+                       }
                        drawRowSelection(pi, x, row, beg, end, beg_margin, end_margin);
                }