Made font color configuration independend from font style configuration.

svn-id: r43205

2 files changed, 55 insertions, 19 deletions

diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index 3fbbdf8d46..784f4fae50 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.6:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.7:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index f74d0f0d2f..03e3a45a30 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -105,31 +105,56 @@
 	<fonts>
 		<font	id = 'text_default'
 				file = 'default'
-				color = 'black'
 		/>
-		<font	id = 'text_hover'
+		<font	id = 'text_button'
 				file = 'default'
+		/>
+		<font	id = 'text_normal'
+				file = 'helvr12-l1.bdf'
+		/>
+
+		<text_color	id = 'color_normal'
+				color = 'black'
+		/>
+
+		<text_color	id = 'color_normal_inverted'
+				color = 'black'
+		/>
+
+		<text_color	id = 'color_normal_hover'
 				color = 'bgreen'
 		/>
-		<font	id = 'text_disabled'
-				file = 'default'
+
+		<text_color	id = 'color_normal_disabled'
 				color = '192, 192, 192'
 		/>
-		<font	id = 'text_inverted'
-				file = 'default'
+
+		<text_color	id = 'color_alternative'
 				color = 'black'
 		/>
-		<font	id = 'text_button'
-				file = 'default'
+
+		<text_color	id = 'color_alternative_inverted'
+				color = 'black'
+		/>
+
+		<text_color	id = 'color_alternative_hover'
+				color = 'bgreen'
+		/>
+
+		<text_color	id = 'color_alternative_disabled'
+				color = '192, 192, 192'
+		/>
+
+		<text_color	id = 'color_button'
 				color = 'white'
 		/>
-		<font	id = 'text_button_hover'
-				file = 'default'
+
+		<text_color	id = 'color_button_hover'
 				color = '255, 214, 84'
 		/>
-		<font	id = 'text_normal'
-				file = 'helvr12-l1.bdf'
-				color = 'black'
+
+		<text_color	id = 'color_button_disabled'
+				color = '192, 192, 192'
 		/>
 	</fonts>
 
@@ -263,6 +288,7 @@
 	<!-- Active tab in the tabs list -->
 	<drawdata id = 'tab_active' cache = 'false'>
 		<text	font = 'text_default'
+				font_color = 'color_normal'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -279,6 +305,7 @@
 	<!-- Inactive tab in the tabs list -->
 	<drawdata id = 'tab_inactive' cache = 'false'>
 		<text	font = 'text_default'
+				font_color = 'color_normal'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -370,6 +397,7 @@
 					orientation = 'bottom'
 		/>
 		<text	font = 'text_default'
+				font_color = 'color_normal'
 				vertical_align = 'center'
 				horizontal_align = 'left'
 		/>
@@ -392,7 +420,8 @@
 					ypos = 'center'
 					orientation = 'bottom'
 		/>
-		<text	font = 'text_disabled'
+		<text	font = 'text_default'
+				font_color = 'color_normal_disabled'
 				vertical_align = 'center'
 				horizontal_align = 'left'
 		/>
@@ -418,7 +447,8 @@
 					ypos = 'center'
 					orientation = 'bottom'
 		/>
-		<text	font = 'text_hover'
+		<text	font = 'text_default'
+				font_color = 'color_normal_hover'
 				vertical_align = 'center'
 				horizontal_align = 'left'
 		/>
@@ -472,6 +502,7 @@
 	<!-- Idle button -->
 	<drawdata id = 'button_idle' cache = 'false'>
 		<text	font = 'text_button'
+				font_color = 'color_button'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -490,7 +521,8 @@
 
 	<!-- Hovered button -->
 	<drawdata id = 'button_hover' cache = 'false'>
-		<text	font = 'text_button_hover'
+		<text	font = 'text_button'
+				font_color = 'color_button_hover'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -509,7 +541,8 @@
 
 	<!-- Disabled button -->
 	<drawdata id = 'button_disabled' cache = 'false'>
-		<text	font = 'text_disabled'
+		<text	font = 'text_button'
+				font_color = 'color_button_disabled'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -528,7 +561,8 @@
 
 	<!-- Disabled checkbox -->
 	<drawdata id = 'checkbox_disabled' cache = 'false'>
-		<text	font = 'text_disabled'
+		<text	font = 'text_default'
+				font_color = 'color_normal_disabled'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>
@@ -540,6 +574,7 @@
 	<!-- Selected checkbox -->
 	<drawdata id = 'checkbox_selected' cache = 'false'>
 		<text	font = 'text_default'
+				font_color = 'color_normal'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>
@@ -551,6 +586,7 @@
 	<!-- Idle checkbox -->
 	<drawdata id = 'checkbox_default' cache = 'false'>
 		<text	font = 'text_default'
+				font_color = 'color_normal'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>