From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 26 Oct 2016 09:18:25 +0000 (+0200)
Subject: When selecting special logos, set their color correctly
X-Git-Tag: 2.2.3~186
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1d4d07b66ecbefbb16a61935f40bf70523c5847d;p=lyx.git

When selecting special logos, set their color correctly

Adapted from 860accd01fb81.
---

diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index 8fa6eadc0e..7822392f25 100644
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -136,7 +136,8 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
 namespace {
 
 void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
-	FontInfo const & font = pi.base.font;
+	FontInfo font = pi.base.font;
+	font.setPaintColor(pi.textColor(font.realColor()));
 	int const em = theFontMetrics(font).em();
 	switch (kind) {
 	case InsetSpecialChar::PHRASE_LYX:
diff --git a/status.22x b/status.22x
index e517a76159..98afdaa364 100644
--- a/status.22x
+++ b/status.22x
@@ -94,6 +94,8 @@ What's new
 - Fix on-screen display of font changes for text-in-math, so that now
   $\textbf{\textsc{a}}$ is also boldened on screen other than in output.
 
+- When selecting special logos, set their color correctly.
+
 
 * INTERNALS