SF.net SVN: geany: [1047] trunk

[eht16 at users.sourceforge.net]

Revision: 1047
          http://svn.sourceforge.net/geany/?rev=1047&view=rev
Author:   eht16
Date:     2006-12-04 06:32:50 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
Use default GTK foreground colour for filenames on notebook tabs instead of hardcoded colour black.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/document.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-12-03 23:05:29 UTC (rev 1046)
+++ trunk/ChangeLog	2006-12-04 14:32:50 UTC (rev 1047)
@@ -1,3 +1,9 @@
+2006-12-04  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/document.c: Use default GTK foreground colour for filenames on
+                   notebook tabs instead of hardcoded colour black.
+
+
 2006-12-03  Enrico Tröger  <enrico.troeger at uvena.de>
 
  * data/filetypes.c, data/filetypes.cpp, data/filetypes.d,

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2006-12-03 23:05:29 UTC (rev 1046)
+++ trunk/src/document.c	2006-12-04 14:32:50 UTC (rev 1047)
@@ -163,20 +163,19 @@
 
 void document_set_text_changed(gint idx)
 {
-	if (idx >= 0 && doc_list[idx].is_valid && ! app->quitting)
+	if (DOC_IDX_VALID(idx) && ! app->quitting)
 	{
-		// changes the color of the tab text according to the status
-		static GdkColor colorred = {0, 65535, 0, 0};
-		static GdkColor colorblack = {0, 0, 0, 0};
+		// changes the colour of the tab text according to the status
+		static GdkColor red = {0, 65535, 0, 0};
+		static GtkStyle *style = NULL;
 
+		if (style == NULL) // use and store default foreground colour
+			style = gtk_rc_get_style(doc_list[idx].tab_label);
+
 		gtk_widget_modify_fg(doc_list[idx].tab_label, GTK_STATE_NORMAL,
-					(doc_list[idx].changed) ? &colorred : &colorblack);
+					(doc_list[idx].changed) ? &red : &(style->fg[GTK_STATE_NORMAL]));
 		gtk_widget_modify_fg(doc_list[idx].tab_label, GTK_STATE_ACTIVE,
-					(doc_list[idx].changed) ? &colorred : &colorblack);
-		gtk_widget_modify_fg(doc_list[idx].tabmenu_label, GTK_STATE_PRELIGHT,
-					(doc_list[idx].changed) ? &colorred : &colorblack);
-		gtk_widget_modify_fg(doc_list[idx].tabmenu_label, GTK_STATE_NORMAL,
-					(doc_list[idx].changed) ? &colorred : &colorblack);
+					(doc_list[idx].changed) ? &red : &(style->fg[GTK_STATE_ACTIVE]));
 
 		ui_save_buttons_toggle(doc_list[idx].changed);
 		ui_set_window_title(idx);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.