talons

commit cc3675668dcfbbd20421aad9054587e47759810e
parent da40f46bb5806f304ffafef618bdbc4f78defbcf
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 12 Mar 2014 14:06:06 +0100

Fix bug #3107, " Height of row in message list does not
reflect font size - three columns, small screen layout"
Patch by Peter Sarvas.

Diffstat:
M
AUTHORS
 | 
1
+
M
src/gtk/authors.h
 | 
1
+
M
src/summaryview.c
 | 
10
++++------

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -303,3 +303,4 @@ contributors (in addition to the above; based on Changelog)
 	Richard Palo
 	Marco Villegas
 	Palmer Dabbelt
+	Peter Sarvas
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
@@ -240,6 +240,7 @@ static char *CONTRIBS_LIST[] = {
 "Sakamoto",
 "Mohammed Sameer",
 "Tobias Sandhaas",
+"Peter Sarvas",
 "Torsten Schoenfeld",
 "Simon 'corecode' Schubert",
 "Kim Schulz",
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -6412,10 +6412,6 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
 	ctree = gtk_sctree_new_with_titles
 		(N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
 
-	/* get normal row height */
-	gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
-	normal_row_height = GTK_CMCLIST(ctree)->row_height;
-
 	if (prefs_common.show_col_headers == FALSE)
 		gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
 
@@ -6598,11 +6594,13 @@ void summary_set_column_order(SummaryView *summaryview)
 	else
 		summary_redisplay_msg(summaryview);
 
+	/* get normal row height */
+	gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
+	normal_row_height = GTK_CMCLIST(ctree)->row_height;		
+		
 	if ((prefs_common.layout_mode == SMALL_LAYOUT || prefs_common.layout_mode == VERTICAL_LAYOUT) &&
 	    prefs_common.two_line_vert) {
 		gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 2*normal_row_height + 2);		
-	} else {
-		gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 0);		
 	}
 }