Commit 6488296f authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Document that a size of (GtkIconSize)-1 means don't scale.

Tue Jan 29 19:04:41 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkstyle.c (gtk_style_render_icon): Document that
        a size of (GtkIconSize)-1 means don't scale.

        * gtk/gtkstyle.c (gtk_default_render_icon): Obey the
        -1 convention.

        * gtk/gtkimage.c (gtk_image_expose): Pass in -1 to
        gtk_style_render_icon() to make sure that we catch it
        obviously if the style's render function tries to
        scale.
parent 708b3f40
Tue Jan 29 19:04:41 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_render_icon): Document that
a size of (GtkIconSize)-1 means don't scale.
* gtk/gtkstyle.c (gtk_default_render_icon): Obey the
-1 convention.
* gtk/gtkimage.c (gtk_image_expose): Pass in -1 to
gtk_style_render_icon() to make sure that we catch it
obviously if the style's render function tries to
scale.
Tue Jan 29 18:50:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimage.c (gtk_image_expose): Optimize exposes of
......
Tue Jan 29 19:04:41 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_render_icon): Document that
a size of (GtkIconSize)-1 means don't scale.
* gtk/gtkstyle.c (gtk_default_render_icon): Obey the
-1 convention.
* gtk/gtkimage.c (gtk_image_expose): Pass in -1 to
gtk_style_render_icon() to make sure that we catch it
obviously if the style's render function tries to
scale.
Tue Jan 29 18:50:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimage.c (gtk_image_expose): Optimize exposes of
......
Tue Jan 29 19:04:41 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_render_icon): Document that
a size of (GtkIconSize)-1 means don't scale.
* gtk/gtkstyle.c (gtk_default_render_icon): Obey the
-1 convention.
* gtk/gtkimage.c (gtk_image_expose): Pass in -1 to
gtk_style_render_icon() to make sure that we catch it
obviously if the style's render function tries to
scale.
Tue Jan 29 18:50:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimage.c (gtk_image_expose): Optimize exposes of
......
Tue Jan 29 19:04:41 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_render_icon): Document that
a size of (GtkIconSize)-1 means don't scale.
* gtk/gtkstyle.c (gtk_default_render_icon): Obey the
-1 convention.
* gtk/gtkimage.c (gtk_image_expose): Pass in -1 to
gtk_style_render_icon() to make sure that we catch it
obviously if the style's render function tries to
scale.
Tue Jan 29 18:50:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimage.c (gtk_image_expose): Optimize exposes of
......
Tue Jan 29 19:04:41 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_render_icon): Document that
a size of (GtkIconSize)-1 means don't scale.
* gtk/gtkstyle.c (gtk_default_render_icon): Obey the
-1 convention.
* gtk/gtkimage.c (gtk_image_expose): Pass in -1 to
gtk_style_render_icon() to make sure that we catch it
obviously if the style's render function tries to
scale.
Tue Jan 29 18:50:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimage.c (gtk_image_expose): Optimize exposes of
......
Tue Jan 29 19:04:41 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_render_icon): Document that
a size of (GtkIconSize)-1 means don't scale.
* gtk/gtkstyle.c (gtk_default_render_icon): Obey the
-1 convention.
* gtk/gtkimage.c (gtk_image_expose): Pass in -1 to
gtk_style_render_icon() to make sure that we catch it
obviously if the style's render function tries to
scale.
Tue Jan 29 18:50:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimage.c (gtk_image_expose): Optimize exposes of
......
Tue Jan 29 19:04:41 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_render_icon): Document that
a size of (GtkIconSize)-1 means don't scale.
* gtk/gtkstyle.c (gtk_default_render_icon): Obey the
-1 convention.
* gtk/gtkimage.c (gtk_image_expose): Pass in -1 to
gtk_style_render_icon() to make sure that we catch it
obviously if the style's render function tries to
scale.
Tue Jan 29 18:50:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimage.c (gtk_image_expose): Optimize exposes of
......
......@@ -1400,7 +1400,7 @@ gtk_image_expose (GtkWidget *widget,
gtk_widget_get_direction (widget),
GTK_WIDGET_STATE (widget),
/* arbitrary */
GTK_ICON_SIZE_SMALL_TOOLBAR,
(GtkIconSize)-1,
widget,
"gtk-image");
......
......@@ -1760,7 +1760,8 @@ gtk_style_real_set_background (GtkStyle *style,
* @source: the #GtkIconSource specifying the icon to render
* @direction: a text direction
* @state: a state
* @size: the size to render the icon at
* @size: the size to render the icon at. A size of (GtkIconSize)-1
* means render at the size of the source and don't scale.
* @widget: the widget
* @detail: a style detail
* @returns: a newly-created #GdkPixbuf containing the rendered icon
......@@ -1905,10 +1906,10 @@ gtk_default_render_icon (GtkStyle *style,
return NULL;
}
/* If the size was wildcarded, then scale; otherwise, leave it
* alone.
/* If the size was wildcarded, and we're allowed to scale, then scale; otherwise,
* leave it alone.
*/
if (gtk_icon_source_get_size_wildcarded (source))
if (size != (GtkIconSize)-1 && gtk_icon_source_get_size_wildcarded (source))
scaled = scale_or_ref (base_pixbuf, width, height);
else
scaled = GDK_PIXBUF (g_object_ref (G_OBJECT (base_pixbuf)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment