anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-12 11:32:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 6327993867)
This commit is contained in:
Vincent van Ravesteijn 2012-04-29 14:26:24 +02:00
parent a102ba7564
commit d4238397b9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiPainter.cpp
View File

@ -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.series())));
sig.append(QChar(static_cast<short>(f.realShape()))); sig.append(QChar(static_cast<short>(f.realShape())));
sig.append(QChar(static_cast<short>(f.size()))); 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()) { if (!monochrome_min_.empty()) {
QColor const & min = monochrome_min_.top(); QColor const & min = monochrome_min_.top();
QColor const & max = monochrome_max_.top(); QColor const & max = monochrome_max_.top();

3
status.20x
View File

@ -160,6 +160,9 @@ What's new
- Fix coloring of insets that come after deleted text insets with - Fix coloring of insets that come after deleted text insets with
change tracking on. change tracking on.
- Fix the random coloring of text when change tracking is on and
pixmap caching is enabled (bug 7667).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION