From f812d0e7b744910e9df5525f71238078794a8fab Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 10 Aug 2009 13:46:17 +0000
Subject: Made font color configuration independend from font style
 configuration.

svn-id: r43205
---
 gui/ThemeParser.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'gui/ThemeParser.h')

diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index e261b6b842..7cfe2abfd5 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -67,9 +67,13 @@ protected:
 				XML_KEY(font)
 					XML_PROP(id, true)
 					XML_PROP(file, true)
-					XML_PROP(color, true)
 					XML_PROP(resolution, false)
 				KEY_END()
+
+				XML_KEY(text_color)
+					XML_PROP(id, true);
+					XML_PROP(color, true);
+				KEY_END()
 			KEY_END()
 
 			XML_KEY(bitmaps)
@@ -143,6 +147,7 @@ protected:
 
 				XML_KEY(text)
 					XML_PROP(font, true)
+					XML_PROP(font_color, true)
 					XML_PROP(vertical_align, true)
 					XML_PROP(horizontal_align, true)
 				KEY_END()
@@ -211,6 +216,7 @@ protected:
 	bool parserCallback_render_info(ParserNode *node);
 	bool parserCallback_defaults(ParserNode *node);
 	bool parserCallback_font(ParserNode *node);
+	bool parserCallback_text_color(ParserNode *node);
 	bool parserCallback_fonts(ParserNode *node);
 	bool parserCallback_text(ParserNode *node);
 	bool parserCallback_palette(ParserNode *node);
-- 
cgit v1.2.3


From d8b2baee97f762c491d4f58d263b17af791d73fc Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 10 Aug 2009 14:05:14 +0000
Subject: Rename 'font_color' attribute for 'text' draw step to 'text_color'.

svn-id: r43206
---
 gui/ThemeParser.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui/ThemeParser.h')

diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index 7cfe2abfd5..92734fa421 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -147,7 +147,7 @@ protected:
 
 				XML_KEY(text)
 					XML_PROP(font, true)
-					XML_PROP(font_color, true)
+					XML_PROP(text_color, true)
 					XML_PROP(vertical_align, true)
 					XML_PROP(horizontal_align, true)
 				KEY_END()
-- 
cgit v1.2.3