[LyX/2.2.x] Fix display of colors in labels of arguments.

[Richard Heck]

commit 275bdcd845946842257853c9c5280e6e774985f4
Author: Richard Heck <rgh...@lyx.org>
Date:   Fri Jul 29 23:36:48 2016 -0400

    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(+), 0 deletions(-)

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index b65257a..63f21b2 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 d5cae98..935d68c 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 a6d4801..d972370 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