[Commits] [SCM] claws branch, gtk3tree, updated. 3.99.0-125-ge98dc4490

[thorsten at claws-mail.org]

The branch, gtk3tree has been updated
       via  e98dc4490e9b0b88fd7b8c3236edc99a3e42dccc (commit)
      from  1d0ded4bd44b4f7fd426da20cb1eaa56841e1e2a (commit)

Summary of changes:
 TODO             | 2 --
 src/folderview.c | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit e98dc4490e9b0b88fd7b8c3236edc99a3e42dccc
Author: Thorsten Maerz <info at netztorte.de>
Date:   Wed Apr 21 10:13:49 2021 +0200

    Fix folder colors shown wrong

diff --git a/TODO b/TODO
index 141af1223..d19e9b151 100644
--- a/TODO
+++ b/TODO
@@ -29,5 +29,3 @@ GtkTreeView based folderview
 
 * The column headers will always steal the focus. Once they are set clickable,
   gtk_widget_set_can_focus() has no effect.
-
-* Folder colors shown wrong
diff --git a/src/folderview.c b/src/folderview.c
index 671fe8608..fbb626790 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -618,7 +618,7 @@ static GtkWidget *treeview_create_unconnected()
 	GtkTreeStore *store = gtk_tree_store_new(N_FOLDER_COLS,
 			G_TYPE_POINTER, /* pointer to FolderItem */
 			PANGO_TYPE_FONT_DESCRIPTION, /* font */
-			GDK_TYPE_COLOR, /* text color */
+			GDK_TYPE_RGBA, /* text color */
 			GDK_TYPE_PIXBUF, /* icon */
 			G_TYPE_STRING, /* folder name */
 			G_TYPE_STRING, /* new */
@@ -653,7 +653,7 @@ static GtkWidget *treeview_create_unconnected()
 	gtk_tree_view_column_set_attributes(column, renderer,
 			"text", F_COL_FOLDER,
 			"font-desc", F_COL_FONT,
-			"foreground-gdk", F_COL_COLOR,
+			"foreground-rgba", F_COL_COLOR,
 			NULL);
 	gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 	gtk_tree_view_column_set_fixed_width(column, prefs_common.folder_col_size[F_COL_FOLDER]);
@@ -1633,13 +1633,13 @@ static void folderview_update_row_iter(FolderView *folderview,
 			(add_unread_mark && folder_has_new_children(item));
 	}
 
-	GdkRGBA folder_color, *color = NULL;
+	GdkRGBA *color = NULL;
 	if (use_color) {
 		color = &folderview->color_new;
 	} else if (item->op_count > 0) {
 		color = &folderview->color_op;
 	} else if (!gdk_rgba_equal(&item->prefs->color, &black)) {
-		color = &folder_color;
+		color = &item->prefs->color;
 	}
 
 	gchar n[32], u[32], t[32];

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail