AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix rendering of icons in some cases

Browse Source 
svn path=/trunk/; revision=22308
This commit is contained in:
Matthias Clasen 2009-02-11 07:25:57 +00:00
parent 6bd8756269
commit 44fb5dcfc8
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2009-02-11 Matthias Clasen <mclasen@redhat.com>
Bug 571249 – Icons are not drawn properly when initial widget
state is insensitive
* gtk/gtkentry.c (gtk_entry_ensure_pixbuf): Render icons
in normal state, regardless of the entrys state. Reported by
Enrico Tröger.
2009-02-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c: Don't emit the file-set signal

30
gtk/gtkentry.c
View File

@ -6252,6 +6252,7 @@ gtk_entry_ensure_pixbuf (GtkEntry *entry,
GtkSettings *settings;
gint width, height;
GtkIconInfo *info;
gint state;
if (!icon_info || icon_info->pixbuf)
return;
@ -6262,10 +6263,13 @@ gtk_entry_ensure_pixbuf (GtkEntry *entry,
case GTK_IMAGE_PIXBUF:
break;
case GTK_IMAGE_STOCK:
state = GTK_WIDGET_STATE (entry);
GTK_WIDGET_STATE (entry) = GTK_STATE_NORMAL;
icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
icon_info->stock_id,
GTK_ICON_SIZE_MENU,
NULL);
GTK_WIDGET_STATE (entry) = state;
break;
case GTK_IMAGE_ICON_NAME:
@ -6285,10 +6289,15 @@ gtk_entry_ensure_pixbuf (GtkEntry *entry,
0, NULL);
if (icon_info->pixbuf == NULL)
icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
GTK_STOCK_MISSING_IMAGE,
GTK_ICON_SIZE_MENU,
NULL);
{
state = GTK_WIDGET_STATE (entry);
GTK_WIDGET_STATE (entry) = GTK_STATE_NORMAL;
icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
GTK_STOCK_MISSING_IMAGE,
GTK_ICON_SIZE_MENU,
NULL);
GTK_WIDGET_STATE (entry) = state;
}
}
break;
@ -6314,10 +6323,15 @@ gtk_entry_ensure_pixbuf (GtkEntry *entry,
}
if (icon_info->pixbuf == NULL)
icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
GTK_STOCK_MISSING_IMAGE,
GTK_ICON_SIZE_MENU,
NULL);
{
state = GTK_WIDGET_STATE (entry);
GTK_WIDGET_STATE (entry) = GTK_STATE_NORMAL;
icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
GTK_STOCK_MISSING_IMAGE,
GTK_ICON_SIZE_MENU,
NULL);
GTK_WIDGET_STATE (entry) = state;
}
}
break;