Re: glimmer showing untagged text

[Michael Karcher <michael karcher dpk berlin fido de>]

On Mon, Dec 09, 2002 at 09:06:48AM +0100, Jeroen Zwartepoorte wrote:
[White space should be plain text, and foreground color should be used]
> Yep. It's a bug. When i wrote the theming support i was short on time
> and didn't fix that before committing. Shouldn't be too hard to fix
> though. Patches are more than welcome :-)

Look three lines below. :-)
Michael Karcher

diff -urN glimmer-pristine/libglimmerfile/glimmer-file.c glimmer/libglimmerfile/glimmer-file.c
--- glimmer-pristine/libglimmerfile/glimmer-file.c	Tue Jul 16 23:47:31 2002
+++ glimmer/libglimmerfile/glimmer-file.c	Mon Dec 16 14:11:39 2002
@@ -2424,8 +2424,9 @@
 	}
 
 	/* Update non-tag styles. */
-	style = glimmer_style_cache_get_style_from_class ("whitespace");
+	style = glimmer_style_cache_get_style_from_class ("plain-text");
 	gtk_widget_modify_base (file->view, GTK_STATE_NORMAL, &style->background);
+	gtk_widget_modify_text (file->view, GTK_STATE_NORMAL, &style->foreground);
 	style = glimmer_style_cache_get_style_from_class ("gutter");
 	gtk_widget_modify_bg (file->view, GTK_STATE_NORMAL, &style->background);
 	gtk_widget_modify_fg (file->view, GTK_STATE_NORMAL, &style->foreground);
diff -urN glimmer-pristine/libglimmerfile/glimmer-style-cache/glimmer-style-styles.h glimmer/libglimmerfile/glimmer-style-cache/glimmer-style-styles.h
--- glimmer-pristine/libglimmerfile/glimmer-style-cache/glimmer-style-styles.h	Tue Jul 16 23:47:32 2002
+++ glimmer/libglimmerfile/glimmer-style-cache/glimmer-style-styles.h	Mon Dec 16 14:14:08 2002
@@ -36,7 +36,7 @@
 	"string",
 	"symbol",
 	"variable",
-	"whitespace",
+	"plain-text",
 	NULL
 };
 
diff -urN glimmer-pristine/libglimmerfile/glimmer-style-cache/themes/classic.xml glimmer/libglimmerfile/glimmer-style-cache/themes/classic.xml
--- glimmer-pristine/libglimmerfile/glimmer-style-cache/themes/classic.xml	Tue Jul 16 23:47:33 2002
+++ glimmer/libglimmerfile/glimmer-style-cache/themes/classic.xml	Mon Dec 16 14:10:57 2002
@@ -102,7 +102,7 @@
 		<background>0x000080</background>
 		<foreground>0xFFFF00</foreground>
 	</style>
-	<style name="whitespace">
+	<style name="plain-text">
 		<bold>false</bold>
 		<italic>false</italic>
 		<background>0x000080</background>
diff -urN glimmer-pristine/libglimmerfile/glimmer-style-cache/themes/default.xml glimmer/libglimmerfile/glimmer-style-cache/themes/default.xml
--- glimmer-pristine/libglimmerfile/glimmer-style-cache/themes/default.xml	Tue Jul 16 23:47:33 2002
+++ glimmer/libglimmerfile/glimmer-style-cache/themes/default.xml	Mon Dec 16 14:11:19 2002
@@ -102,10 +102,10 @@
 		<background>0xFFFFFF</background>
 		<foreground>0x00CF00</foreground>
 	</style>
-	<style name="whitespace">
+	<style name="plain-text">
 		<bold>false</bold>
 		<italic>false</italic>
 		<background>0xFFFFFF</background>
-		<foreground>0xFFFFFF</foreground>
+		<foreground>0x000000</foreground>
 	</style>
 </glimmer-theme>