Prevent more local colors from leaking (#6626)

[features.git] / src / insets / InsetNote.cpp

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 28d8db18e5d42f48b58be6614e8a440139990ec1..adacef3bae267066beec930dacb5f5b707ca6f65 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -327,12 +327,15 @@ bool InsetNote::allowSpellCheck() const
 FontInfo InsetNote::getFont() const
 {
        FontInfo font = getLayout().font();
-       // FIXME: This hardcoded color is a hack!
        if (params_.type == InsetNoteParams::Greyedout
-           && buffer().params().notefontcolor != lyx::rgbFromHexName("#cccccc")) {
+           && buffer().params().isnotefontcolor) {
                ColorCode c = lcolor.getFromLyXName("notefontcolor");
                if (c != Color_none)
                        font.setColor(c);
+               // This is the local color (not overridden by other documents)
+               ColorCode lc = lcolor.getFromLyXName("notefontcolor@" + buffer().fileName().absFileName());
+               if (lc != Color_none)
+                       font.setPaintColor(lc);
        }
        return font;
 }