From 013dc6cb3a573b1accdce7c7ca1b9adef9e9b6f6 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Sun, 29 Apr 2012 12:31:31 +0200 Subject: [PATCH] Fix bug #7653: Quotation marks have wrong color Quotation marks had the wrong color when using change tracking, or when selecting. (cherry picked from commit 14ef7d2b82f22836f792a983b1f07d3b57e249e7) --- src/insets/InsetQuotes.cpp | 11 ++++++----- status.20x | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp index 8586ce18d5..1295f27f07 100644 --- a/src/insets/InsetQuotes.cpp +++ b/src/insets/InsetQuotes.cpp @@ -230,14 +230,15 @@ void InsetQuotes::draw(PainterInfo & pi, int x, int y) const { // FIXME: should we add a language or a font parameter member? docstring const text = displayString(); - + FontInfo font = pi.base.font; + font.setPaintColor(pi.textColor(font.realColor())); if (text.length() == 2 && text[0] == text[1]) { - pi.pain.text(x, y, text[0], pi.base.font); - int const t = theFontMetrics(pi.base.font) + pi.pain.text(x, y, text[0], font); + int const t = theFontMetrics(font) .width(','); - pi.pain.text(x + t, y, text[0], pi.base.font); + pi.pain.text(x + t, y, text[0], font); } else { - pi.pain.text(x, y, text, pi.base.font); + pi.pain.text(x, y, text, font); } } diff --git a/status.20x b/status.20x index 6beef61bfe..178b31ed58 100644 --- a/status.20x +++ b/status.20x @@ -163,6 +163,8 @@ What's new - Fix the random coloring of text when change tracking is on and pixmap caching is enabled (bug 7667). +- Fix the coloring of Quotation marks with change tracking (bug 7653). + * DOCUMENTATION AND LOCALIZATION -- 2.39.5