From faf2d31864d3c7541a5519e5012a8d664ef58d41 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Wed, 13 Jul 2005 14:28:02 +0000 Subject: [PATCH] let's take the MIN of width and max_width here, not width and max_width != 2005-07-13 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_new_column_width): let's take the MIN of width and max_width here, not width and max_width != -1. (fixes #144480, reported by Mikael Magnusson). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreeview.c | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d99da1cc4e..6e9be24859 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-13 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_new_column_width): let's take + the MIN of width and max_width here, not width and max_width != -1. + (fixes #144480, reported by Mikael Magnusson). + 2005-07-13 Matthias Clasen * gtk/gtkicontheme.c (load_themes): Don't keep the caches diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d99da1cc4e..6e9be24859 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-07-13 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_new_column_width): let's take + the MIN of width and max_width here, not width and max_width != -1. + (fixes #144480, reported by Mikael Magnusson). + 2005-07-13 Matthias Clasen * gtk/gtkicontheme.c (load_themes): Don't keep the caches diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d99da1cc4e..6e9be24859 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-07-13 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_new_column_width): let's take + the MIN of width and max_width here, not width and max_width != -1. + (fixes #144480, reported by Mikael Magnusson). + 2005-07-13 Matthias Clasen * gtk/gtkicontheme.c (load_themes): Don't keep the caches diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index d1978ecb40..164e900727 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -9229,7 +9229,7 @@ gtk_tree_view_new_column_width (GtkTreeView *tree_view, width = MAX (column->min_width, width); if (column->max_width != -1) - width = MIN (width, column->max_width != -1); + width = MIN (width, column->max_width); *x = rtl ? (column->button->allocation.x + column->button->allocation.width - width) : (column->button->allocation.x + width);