]> git.lyx.org Git - features.git/commitdiff
Fix display of colors in labels of arguments.
authorRichard Heck <rgheck@lyx.org>
Sat, 30 Jul 2016 03:36:48 +0000 (23:36 -0400)
committerRichard Heck <rgheck@lyx.org>
Sat, 30 Jul 2016 03:36:48 +0000 (23:36 -0400)
We need to handle this specially, just as we do the main font.

src/insets/InsetArgument.cpp
src/insets/InsetArgument.h

index da807d201a40af30e34192970e0c9c2c1c87be24..f271c148023cab7fd6aa7de650919da6c27de495 100644 (file)
@@ -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();
index d5cae98cb05ddac36c78f627434e875313431c76..935d68cbbc29f877459755b39e488c9ff380bcf8 100644 (file)
@@ -77,6 +77,8 @@ public:
        ///
        FontInfo getLabelfont() const;
        ///
+       ColorCode labelColor() const;
+       ///
        void setButtonLabel();
        //@}