AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-09 04:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Move some comments around

Browse Source
This commit is contained in:
Matthias Clasen 2014-06-22 22:04:00 -04:00
parent a44f01c573
commit fe92c4478e
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkicontheme.c
View File

@ -1710,9 +1710,7 @@ real_choose_icon (GtkIconTheme *icon_theme,
{ {
icon_info = icon_info_new (ICON_THEME_DIR_UNTHEMED, size, 1); icon_info = icon_info_new (ICON_THEME_DIR_UNTHEMED, size, 1);
/* A SVG icon, when allowed, beats out a XPM icon, but not /* A SVG icon, when allowed, beats out a XPM icon, but not a PNG icon */
* a PNG icon
*/
if (allow_svg && if (allow_svg &&
unthemed_icon->svg_filename && unthemed_icon->svg_filename &&
(!unthemed_icon->no_svg_filename || (!unthemed_icon->no_svg_filename ||
@ -1912,7 +1910,6 @@ choose_icon (GtkIconTheme *icon_theme,
return icon_info; return icon_info;
} }
/** /**
* gtk_icon_theme_lookup_icon: * gtk_icon_theme_lookup_icon:
* @icon_theme: a #GtkIconTheme * @icon_theme: a #GtkIconTheme
@ -3704,9 +3701,6 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info,
if (icon_info->load_error) if (icon_info->load_error)
return FALSE; return FALSE;
/* SVG icons are a special case - we just immediately scale them
* to the desired size
*/
if (icon_info->icon_file && !icon_info->loadable) if (icon_info->icon_file && !icon_info->loadable)
icon_info->loadable = G_LOADABLE_ICON (g_file_icon_new (icon_info->icon_file)); icon_info->loadable = G_LOADABLE_ICON (g_file_icon_new (icon_info->icon_file));
@ -3770,6 +3764,9 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info,
&icon_info->load_error); &icon_info->load_error);
if (stream) if (stream)
{ {
/* SVG icons are a special case - we just immediately scale them
* to the desired size
*/
if (icon_info->is_svg) if (icon_info->is_svg)
{ {
gint size; gint size;