procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

return GTK_ICON_SIZE_INVALID for non-existant icons.

Browse source 
2003-04-11  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpwidgets-utils.c (gimp_get_icon_size): return
	GTK_ICON_SIZE_INVALID for non-existant icons.

	* app/widgets/gimppreviewrenderer.c: handle GTK_ICON_SIZE_INVALID.
This commit is contained in:
Sven Neumann 2003-04-11 21:23:34 +00:00 • committed by Sven Neumann
parent 3343455c13
commit a24b7de0c4
5 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2003-04-11 Sven Neumann <sven@gimp.org>
* app/widgets/gimpwidgets-utils.c (gimp_get_icon_size): return
GTK_ICON_SIZE_INVALID for non-existant icons.
* app/widgets/gimppreviewrenderer.c: handle GTK_ICON_SIZE_INVALID.
2003-04-11 Michael Natterer <mitch@gimp.org>
* app/gui/file-new-dialog.c: s/NewImageInfo/FileNewDialog/g,

3
app/widgets/gimppreviewrenderer.c
View file

@ -709,7 +709,7 @@ gimp_preview_renderer_default_render_stock (GimpPreviewRenderer *renderer,
GtkWidget *widget,
const gchar *stock_id)
{
GdkPixbuf *pixbuf;
GdkPixbuf *pixbuf = NULL;
GtkIconSize icon_size;
g_return_if_fail (GIMP_IS_PREVIEW_RENDERER (renderer));
@ -731,6 +731,7 @@ gimp_preview_renderer_default_render_stock (GimpPreviewRenderer *renderer,
icon_size = gimp_get_icon_size (widget, stock_id, GTK_ICON_SIZE_INVALID,
renderer->width, renderer->height);
if (icon_size)
pixbuf = gtk_widget_render_icon (widget, stock_id, icon_size, NULL);
if (pixbuf)

3
app/widgets/gimpviewrenderer.c
View file

@ -709,7 +709,7 @@ gimp_preview_renderer_default_render_stock (GimpPreviewRenderer *renderer,
GtkWidget *widget,
const gchar *stock_id)
{
GdkPixbuf *pixbuf;
GdkPixbuf *pixbuf = NULL;
GtkIconSize icon_size;
g_return_if_fail (GIMP_IS_PREVIEW_RENDERER (renderer));
@ -731,6 +731,7 @@ gimp_preview_renderer_default_render_stock (GimpPreviewRenderer *renderer,
icon_size = gimp_get_icon_size (widget, stock_id, GTK_ICON_SIZE_INVALID,
renderer->width, renderer->height);
if (icon_size)
pixbuf = gtk_widget_render_icon (widget, stock_id, icon_size, NULL);
if (pixbuf)

7
app/widgets/gimpwidgets-utils.c
View file

@ -307,14 +307,17 @@ gimp_get_icon_size (GtkWidget *widget,
g_return_val_if_fail (width > 0, icon_size);
g_return_val_if_fail (height > 0, icon_size);
icon_set = gtk_style_lookup_icon_set (widget->style, stock_id);
if (! icon_set)
return GTK_ICON_SIZE_INVALID;
if (! gtk_icon_size_lookup (max_size, &max_width, &max_height))
{
max_width = 1024;
max_height = 1024;
}
icon_set = gtk_style_lookup_icon_set (widget->style, stock_id);
gtk_icon_set_get_sizes (icon_set, &sizes, &n_sizes);
for (i = 0; i < n_sizes; i++)

10
etc/templaterc
View file

@ -83,6 +83,16 @@
(resolution-unit inches)
(image-type rgb)
(fill-type background-fill))
(GimpTemplate "Toilet Paper (US, 300dpi)"
(stock-id "gimp-toilet-paper")
(width 1350)
(height 1350)
(unit inches)
(xresolution 300.000000)
(yresolution 300.000000)
(resolution-unit inches)
(image-type rgb)
(fill-type background-fill))
(GimpTemplate "CD Cover (300dpi)"
(stock-id "gtk-cdrom")
(width 1429)