Avoid duplicating mode changing commands

[lyx.git] / src / RowPainter.cpp

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 08ac66d467c85bcfc7e72d979ef42f96fa8fa05a..0bbcb5723d3743bdb4d3d7319c9806328295ac54 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -513,14 +513,17 @@ void RowPainter::paintLast() const
                FontMetrics const & fm = theFontMetrics(font);
                int const size = int(0.75 * fm.maxAscent());
                int const y = yo_ - size;
-               int const max_row_width = width_ - size - Inset::TEXT_TO_INSET_OFFSET;
-               int x = is_rtl ? nestMargin() + changebarMargin()
-                       : max_row_width - row_.right_margin;
 
                // If needed, move the box a bit to avoid overlapping with text.
-               int const rem = max_row_width - row_.width();
-               if (rem <= 0)
-                       x += is_rtl ? rem : - rem;
+               int x = 0;
+               if (is_rtl) {
+                       int const normal_x = nestMargin() + changebarMargin();
+                       x = min(normal_x, row_.left_margin - size - Inset::TEXT_TO_INSET_OFFSET);
+               } else {
+                       int const normal_x = width_ - row_.right_margin
+                               - size - Inset::TEXT_TO_INSET_OFFSET;
+                       x = max(normal_x, row_.width());
+               }
 
                if (endlabel == END_LABEL_BOX)
                        pi_.pain.rectangle(x, y, size, size, Color_eolmarker);
@@ -550,8 +553,15 @@ void RowPainter::paintOnlyInsets()
        Row::const_iterator const & end = row_.end();
        for ( ; cit != end ; ++cit) {
                Row::Element const & e = *cit;
-               if (e.type == Row::INSET)
-                               paintInset(e);
+               if (e.type == Row::INSET) {
+                       paintInset(e);
+                       // The line that indicates word in a different language
+                       paintForeignMark(e);
+                       // change tracking (not for insets that handle it themselves)
+                       if (!e.inset->canPaintChange(*pi_.base.bv))
+                               paintChange(e);
+               }
+
                x_ += e.full_width();
        }
 }