Go back to not scaling up at all. Less magic.

2004-10-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
	not scaling up at all. Less magic.
This commit is contained in:
Matthias Clasen 2004-10-05 17:06:00 +00:00 committed by Matthias Clasen
parent 841bb40d78
commit dd0a7ce608
5 changed files with 21 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2004-10-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
not scaling up at all. Less magic.
Tue Oct 5 17:06:26 2004 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_size_allocate): if REQUEST_NEEDED is still

View File

@ -1,3 +1,8 @@
2004-10-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
not scaling up at all. Less magic.
Tue Oct 5 17:06:26 2004 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_size_allocate): if REQUEST_NEEDED is still

View File

@ -1,3 +1,8 @@
2004-10-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
not scaling up at all. Less magic.
Tue Oct 5 17:06:26 2004 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_size_allocate): if REQUEST_NEEDED is still

View File

@ -1,3 +1,8 @@
2004-10-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
not scaling up at all. Less magic.
Tue Oct 5 17:06:26 2004 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_size_allocate): if REQUEST_NEEDED is still

View File

@ -2326,7 +2326,7 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info,
icon_info->scale = 1.0;
if (icon_info->dir_type == ICON_THEME_DIR_UNTHEMED)
icon_info->scale = MIN (icon_info->scale, 1.5);
icon_info->scale = MIN (icon_info->scale, 1.0);
}
/* We don't short-circuit out here for scale_only, since, now