talons

commit 045264bfc246f33a7790cd87125c3a2876698fe3
parent b3ae2518300138611f8d7908169785140d4da7a6
Author: Paul <paul@claws-mail.org>
Date:   Sat, 14 Sep 2019 09:44:10 +0100

fix bolding of target folder

target folder (when not using 'execute immediately') lost its boldness
recently. This reinstates that, and makes the target folder colour
override all other colours.

Diffstat:
M
src/folderview.c
 | 
20
+++++++++-----------

1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/folderview.c b/src/folderview.c
@@ -1711,8 +1711,8 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
 			use_bold = use_color = TRUE;
 		procmsg_msg_list_free(list);
 	} else {
-		/* if unread messages exist, print with bold font */
-		use_bold = (item->unread_msgs > 0|| item->new_msgs > 0) 
+		/* if unread messages exist or target folder is set, print with bold font */
+		use_bold = (item->unread_msgs > 0 || item->new_msgs > 0 || item->op_count > 0)
 				|| add_unread_mark;
 		/* if new messages exist, print with colored letter */
 		use_color =
@@ -1725,19 +1725,17 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
 
 	if (use_bold) {
 		style = bold_style;
-		if (use_color) {
-			gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_new);
-		} else if (item->op_count > 0) {
+		if (item->op_count > 0) {
 			gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_op);
-		} else if (!gdk_rgba_equal(&item->prefs->color, &black)) {
-			gtk_cmctree_node_set_foreground(ctree, node, &item->prefs->color);
-		}
 	} else if (use_color) {
 		gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_new);
 	} else if (item->op_count > 0) {
-		gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_op);
-	} else if (!gdk_rgba_equal(&item->prefs->color, &black)) {
-		gtk_cmctree_node_set_foreground(ctree, node, &item->prefs->color);
+		}
+	} else if (use_color) {
+		gtk_cmctree_node_set_foreground(ctree, node, &folderview->color_new);
+	} else if (item->prefs->color != 0) {
+		gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
+		gtk_cmctree_node_set_foreground(ctree, node, &gdk_color);
 	}
 
 	gtk_cmctree_node_set_row_style(ctree, node, style);