Fix bug #7667: Pixmap cache and CT lead to random colors

The signature of the character in cache should take into account the
change tracking baseColor (author) and mergeColor (added/deleted). If not,
we will mixup different cached pixmaps.

(cherry picked from commit 63279938670e753b825ebb42c68d9b6be3a3937a)

diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp
index 3ade5c918857c680433f94051ff31c64b772d5db..5cb43a039b79df9117a024a13bd3f6d87d563dbf 100644 (file)
--- a/src/frontends/qt4/GuiPainter.cpp
+++ b/src/frontends/qt4/GuiPainter.cpp
@@ -96,7 +96,9 @@ QString GuiPainter::generateStringSignature(QString const & str, FontInfo const
        sig.append(QChar(static_cast<short>(f.series())));
        sig.append(QChar(static_cast<short>(f.realShape())));
        sig.append(QChar(static_cast<short>(f.size())));
-       sig.append(QChar(static_cast<short>(f.color())));
+       Color const & color = f.realColor();
+       sig.append(QChar(static_cast<short>(color.baseColor)));
+       sig.append(QChar(static_cast<short>(color.mergeColor)));
        if (!monochrome_min_.empty()) {
                QColor const & min = monochrome_min_.top();
                QColor const & max = monochrome_max_.top();

diff --git a/status.20x b/status.20x
index fde5f3295027ee3a5603c025b14c3d5119d53a9c..6beef61bfe33fdab7095e13fd3ef23490571b141 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -160,6 +160,9 @@ What's new
 - Fix coloring of insets that come after deleted text insets with
   change tracking on.
 
+- Fix the random coloring of text when change tracking is on and 
+  pixmap caching is enabled (bug 7667).
+
 
 * DOCUMENTATION AND LOCALIZATION