commit 5f2023796a376a00d7c8ca67adeda3205a48e43e
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Jul 20 23:25:17 2016 +0200
When painting only insets, paint also change and language marks
Fixes bug #10265.
(cherry picked from commit c73923c51901ef7d7b0a0a3e0a4a581671fbe0f1)
---
src/RowPainter.cpp | 6 ++++++
status.22x | 1 +
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/RowPainter.cpp b/src/RowPainter.cpp
index 8c62926..fdd7924 100644
--- 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 64aedc8..7800d1c 100644
--- 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
