From: Richard Heck <rgheck@lyx.org>
Date: Sat, 30 Jul 2016 03:36:48 +0000 (-0400)
Subject: Fix display of colors in labels of arguments.
X-Git-Tag: 2.3.0alpha1~1208
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=96a8156557731a914087b29ec7e976960c0b8c36;p=features.git

Fix display of colors in labels of arguments.

We need to handle this specially, just as we do the main font.
---

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index da807d201a..f271c14802 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -257,6 +257,13 @@ FontInfo InsetArgument::getLabelfont() const
 }
 
 
+ColorCode InsetArgument::labelColor() const {
+	if (labelfont_.color() != Color_inherit)
+		return labelfont_.color();
+	return InsetCollapsable::labelColor();
+}
+
+
 InsetLayout::InsetDecoration InsetArgument::decoration() const
 {
 	InsetLayout::InsetDecoration dec = getLayout().decoration();
diff --git a/src/insets/InsetArgument.h b/src/insets/InsetArgument.h
index d5cae98cb0..935d68cbbc 100644
--- a/src/insets/InsetArgument.h
+++ b/src/insets/InsetArgument.h
@@ -77,6 +77,8 @@ public:
 	///
 	FontInfo getLabelfont() const;
 	///
+	ColorCode labelColor() const;
+	///
 	void setButtonLabel();
 	//@}