anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix display of colors in labels of arguments.

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

(cherry picked from commit 96a8156557)
This commit is contained in:
Richard Heck 2016-07-29 23:36:48 -04:00
parent 5e6f9d1753
commit 275bdcd845
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/insets/InsetArgument.cpp
View File

@ -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 InsetArgument::decoration() const
{ {
InsetLayout::InsetDecoration dec = getLayout().decoration(); InsetLayout::InsetDecoration dec = getLayout().decoration();

2
src/insets/InsetArgument.h
View File

@ -77,6 +77,8 @@ public:
/// ///
FontInfo getLabelfont() const; FontInfo getLabelfont() const;
/// ///
ColorCode labelColor() const;
///
void setButtonLabel(); void setButtonLabel();
//@} //@}

2
status.22x
View File

@ -57,6 +57,8 @@ What's new
- Fix display glitch when switching to Description layout with an inset - Fix display glitch when switching to Description layout with an inset
at the beginning of the paragraph (bug 10163) at the beginning of the paragraph (bug 10163)
- Fix display of label font for argument insets.
* USER INTERFACE * USER INTERFACE