let's take the MIN of width and max_width here, not width and max_width !=

2005-07-13  Kristian Rietveld  <kris@gtk.org>

	* 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).
This commit is contained in:
Kristian Rietveld 2005-07-13 14:28:02 +00:00 committed by Kristian Rietveld
parent c251818ca0
commit faf2d31864
4 changed files with 19 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2005-07-13 Kristian Rietveld <kris@gtk.org>
* 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 <mclasen@redhat.com>
* gtk/gtkicontheme.c (load_themes): Don't keep the caches

View File

@ -1,3 +1,9 @@
2005-07-13 Kristian Rietveld <kris@gtk.org>
* 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 <mclasen@redhat.com>
* gtk/gtkicontheme.c (load_themes): Don't keep the caches

View File

@ -1,3 +1,9 @@
2005-07-13 Kristian Rietveld <kris@gtk.org>
* 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 <mclasen@redhat.com>
* gtk/gtkicontheme.c (load_themes): Don't keep the caches

View File

@ -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);