From 275bdcd845946842257853c9c5280e6e774985f4 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@lyx.org>
Date: Fri, 29 Jul 2016 23:36:48 -0400
Subject: [PATCH] Fix display of colors in labels of arguments.

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

(cherry picked from commit 96a8156557731a914087b29ec7e976960c0b8c36)
---
 src/insets/InsetArgument.cpp | 7 +++++++
 src/insets/InsetArgument.h   | 2 ++
 status.22x                   | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index b65257af97..63f21b2da5 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -255,6 +255,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();
 	//@}
 
diff --git a/status.22x b/status.22x
index a6d4801d73..d97237088e 100644
--- a/status.22x
+++ b/status.22x
@@ -57,6 +57,8 @@ What's new
 - Fix display glitch when switching to Description layout with an inset
   at the beginning of the paragraph (bug 10163)
 
+- Fix display of label font for argument insets.
+
 
 * USER INTERFACE
 
-- 
2.39.5