From c55368270276c40d225eadfcd51498e05823ada0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Thu, 8 Apr 2010 02:13:05 +0000
Subject: [PATCH] Buffer.cpp: show the correct color that is set for the
 document

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34086 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Buffer.cpp       | 4 ++++
 src/BufferParams.cpp | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index cc7eae04f4..4bff27b97b 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -672,7 +672,11 @@ int Buffer::readHeader(Lexer & lex)
 	params().fontcolor = lyx::rgbFromHexName("#000000");
 	params().isfontcolor = false;
 	params().notefontcolor = lyx::rgbFromHexName("#cccccc");
+	lyx::dispatch(FuncRequest(LFUN_SET_COLOR,
+		from_utf8("greyedouttext #cccccc")));
 	params().boxbgcolor = lyx::rgbFromHexName("#ff0000");
+	lyx::dispatch(FuncRequest(LFUN_SET_COLOR,
+		from_utf8("shaded #ff0000")));
 
 	for (int i = 0; i < 4; ++i) {
 		params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index dcb9fa6579..6ca616ae38 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -738,14 +738,12 @@ string BufferParams::readToken(Lexer & lex, string const & token,
 		string color = lex.getString();
 		notefontcolor = lyx::rgbFromHexName(color);
 		// set the font color within LyX
-		// FIXME: the color is correctly set but later overwritten by the default
 		lcolor.setColor(Color_greyedouttext, color);
 	} else if (token == "\\boxbgcolor") {
 		lex.eatLine();
 		string color = lex.getString();
 		boxbgcolor = lyx::rgbFromHexName(color);
 		// set the font color within LyX
-		// FIXME: the color is correctly set but later overwritten by the default
 		lcolor.setColor(Color_shadedbg, color);
 	} else if (token == "\\paperwidth") {
 		lex >> paperwidth;