forked from AuroraMiddleware/gtk
icon-helper: don't warn out when the icon size is GTK_ICON_SIZE_INVALID
We can call ensure_icon_size() for an empty image; don't warn out in that case, but just return a zero width.
This commit is contained in:
parent
e37c55aa3e
commit
d300ddc5e4
@ -128,8 +128,15 @@ ensure_icon_size (GtkIconHelper *self,
|
||||
self->priv->icon_size,
|
||||
&width, &height))
|
||||
{
|
||||
g_warning ("Invalid icon size %d\n", self->priv->icon_size);
|
||||
width = height = 24;
|
||||
if (self->priv->icon_size == GTK_ICON_SIZE_INVALID)
|
||||
{
|
||||
width = height = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
g_warning ("Invalid icon size %d\n", self->priv->icon_size);
|
||||
width = height = 24;
|
||||
}
|
||||
}
|
||||
|
||||
*width_out = width;
|
||||
|
Loading…
Reference in New Issue
Block a user