commit 864d416b58706f51e7dcf3e3aace31e1c9e12488
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sun Apr 6 08:30:53 2025 +0200

    Fix greyedout note local color setting
---
 src/insets/InsetNote.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 83aa70fa91..231945ae90 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -372,13 +372,14 @@ FontInfo InsetNote::getFont() const
        FontInfo font = getLayout().font();
        if (params_.type == InsetNoteParams::Greyedout) {
                ColorCode c = lcolor.getFromLyXName("notefontcolor");
-               if (c != Color_none)
-                       font.setColor(c);
                // This is the local color (not overridden by other documents)
                // the color might not yet be initialized for new documents
                ColorCode lc = lcolor.getFromLyXName("notefontcolor@" + 
buffer().fileName().absFileName(), false);
-               if (lc != Color_none)
+               if (lc != Color_none) {
+                       font.setColor(lc);
                        font.setPaintColor(lc);
+               } else if (c != Color_none)
+                       font.setColor(c);
        }
        return font;
 }
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs

Reply via email to