When painting only insets, paint also change and language marks

Fixes bug #10265.

(cherry picked from commit c73923c51901ef7d7b0a0a3e0a4a581671fbe0f1)

diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 8c62926889000c68a6262d724a9c30e8752920f2..fdd79240b4703471e65794eeef259cc436015d31 100644 (file)
--- a/src/RowPainter.cpp
+++ b/src/RowPainter.cpp
@@ -587,7 +587,13 @@ void RowPainter::paintOnlyInsets()
                                x_ += e.full_width();
                                continue;
                        }
+                       int orig_x = x_;
                        paintInset(e.inset, e.font, e.change, e.pos);
+                       // The line that indicates word in a different language
+                       paintForeignMark(orig_x, e.font.language(), e.dim.descent());
+                       // change tracking (not for insets that handle it themselves)
+                       if (! e.inset->canTrackChanges())
+                               paintChange(orig_x, e.font, e.change);
                } else
                        x_ += e.full_width();
        }

diff --git a/status.22x b/status.22x
index 64aedc88c40319b31e85bcb6a1a06d7f81245f7f..7800d1cb9cc673300ee756f2414f107a97ceb893 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -49,6 +49,7 @@ What's new
 
 - Fix display of multi-author citations when the GUI language is not English.
 
+- Fix bug where change tracking marks are lost under math insets (bug 10265).
 
 * INTERNALS