callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply some arbitrary lower limit for the guessed wrap width. (#332466,

Browse Source 
2006-03-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconview.c (adjust_wrap_width): Apply some
	arbitrary lower limit for the guessed wrap width. (#332466,
	Donald Straney)
This commit is contained in:
Matthias Clasen
2006-03-06 04:55:53 +00:00
committed by Matthias Clasen
parent 459eeebde9
commit 6c5c31f75b
3 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2006-03-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (adjust_wrap_width): Apply some
arbitrary lower limit for the guessed wrap width. (#332466,
Donald Straney)
2006-03-05 Matthias Clasen <mclasen@redhat.com>
Fix handling of image-only buttons. (#332985, Kalle
Vahlmann, #333555)
* gtk/gtkbutton.c (gtk_button_construct_child): Don't
return early if there an image to show.
(show_image): Always return TRUE if there is no text.
2006-03-04 Matthias Clasen <mclasen@redhat.com> 2006-03-04 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkinput-x11 (gdk_input_translate_coordinates): * gdk/x11/gdkinput-x11 (gdk_input_translate_coordinates):

15
ChangeLog.pre-2-10
View File

@ -1,3 +1,18 @@
2006-03-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (adjust_wrap_width): Apply some
arbitrary lower limit for the guessed wrap width. (#332466,
Donald Straney)
2006-03-05 Matthias Clasen <mclasen@redhat.com>
Fix handling of image-only buttons. (#332985, Kalle
Vahlmann, #333555)
* gtk/gtkbutton.c (gtk_button_construct_child): Don't
return early if there an image to show.
(show_image): Always return TRUE if there is no text.
2006-03-04 Matthias Clasen <mclasen@redhat.com> 2006-03-04 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkinput-x11 (gdk_input_translate_coordinates): * gdk/x11/gdkinput-x11 (gdk_input_translate_coordinates):

2
gtk/gtkiconview.c
View File

@ -2607,7 +2607,7 @@ adjust_wrap_width (GtkIconView *icon_view,
NULL); NULL);
if (item->width == -1) if (item->width == -1)
wrap_width = pixbuf_width; wrap_width = MAX (2 * pixbuf_width, 50);
else if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL) else if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL)
wrap_width = item->width; wrap_width = item->width;
else else