applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some theme thumbnail rendering gotchas

Browse source 
The theme thumbnail rendering code gets the rendering of folder icons somewhat
wrong, ie it frequently shows a gnome-fs-directory icon from gnome even if the
actual theme has a folder icon. Improve things by using modern GtkIconTheme
api in a better way.
This commit is contained in:
Matthias Clasen 2009-07-18 01:07:32 -04:00
parent b812fdd75e
commit 8f60c01f29
1 changed files with 15 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

58
capplets/common/theme-thumbnail.c
View file

@ -91,7 +91,6 @@ static int pipe_from_factory_fd[2];
#define GTK_THUMBNAIL_SIZE 96 #define GTK_THUMBNAIL_SIZE 96
#define METACITY_THUMBNAIL_WIDTH 120 #define METACITY_THUMBNAIL_WIDTH 120
#define METACITY_THUMBNAIL_HEIGHT 60 #define METACITY_THUMBNAIL_HEIGHT 60
#define ICON_THUMBNAIL_SIZE 48
static void static void
@ -164,44 +163,35 @@ static GdkPixbuf *
create_folder_icon (char *icon_theme_name) create_folder_icon (char *icon_theme_name)
{ {
GtkIconTheme *icon_theme; GtkIconTheme *icon_theme;
GdkPixbuf *folder_icon = NULL, *retval; GdkPixbuf *folder_icon = NULL;
GtkIconInfo *folder_icon_info; GtkIconInfo *folder_icon_info;
const gchar *filename;
gchar *example_icon_name; gchar *example_icon_name;
const gchar *icon_names[5];
gint i;
icon_theme = gtk_icon_theme_new (); icon_theme = gtk_icon_theme_new ();
gtk_icon_theme_set_custom_theme (icon_theme, icon_theme_name); gtk_icon_theme_set_custom_theme (icon_theme, icon_theme_name);
folder_icon_info = NULL; i = 0;
/* Get the Example icon name in the theme if specified */ /* Get the Example icon name in the theme if specified */
example_icon_name = gtk_icon_theme_get_example_icon_name (icon_theme); example_icon_name = gtk_icon_theme_get_example_icon_name (icon_theme);
if (example_icon_name != NULL) if (example_icon_name != NULL)
folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, example_icon_name, 48, GTK_ICON_LOOKUP_FORCE_SVG); icon_names[i++] = example_icon_name;
g_free (example_icon_name); icon_names[i++] = "x-directory-normal";
icon_names[i++] = "gnome-fs-directory";
/* If an Example is not specified, fall back to using the folder icons in icon_names[i++] = "folder";
the order of Icon Nameing Spec, "gnome-fs-directory", and "folder" */ icon_names[i++] = NULL;
if (folder_icon_info == NULL)
folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, "x-directory-normal", 48, GTK_ICON_LOOKUP_FORCE_SVG);
if (folder_icon_info == NULL)
folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, "gnome-fs-directory", 48, GTK_ICON_LOOKUP_FORCE_SVG);
if (folder_icon_info == NULL)
folder_icon_info = gtk_icon_theme_lookup_icon (icon_theme, "folder", 48, GTK_ICON_LOOKUP_FORCE_SVG);
g_object_unref (icon_theme);
folder_icon_info = gtk_icon_theme_choose_icon (icon_theme, icon_names, 48, GTK_ICON_LOOKUP_FORCE_SIZE);
if (folder_icon_info != NULL) if (folder_icon_info != NULL)
{ {
filename = gtk_icon_info_get_filename (folder_icon_info); folder_icon = gtk_icon_info_load_icon (folder_icon_info, NULL);
if (filename != NULL)
{
folder_icon = gdk_pixbuf_new_from_file (filename, NULL);
}
gtk_icon_info_free (folder_icon_info); gtk_icon_info_free (folder_icon_info);
} }
g_object_unref (icon_theme);
g_free (example_icon_name);
/* render the icon to the thumbnail */ /* render the icon to the thumbnail */
if (folder_icon == NULL) if (folder_icon == NULL)
{ {
@ -216,25 +206,7 @@ create_folder_icon (char *icon_theme_name)
gtk_widget_destroy (dummy); gtk_widget_destroy (dummy);
} }
/* Some icons don't come back at the requested dimensions, so we need to scale return folder_icon;
* them. The width is usually the largest dimension for icons that come at
* irregular sizes, so use this to calculate the scale factor
*/
if (gdk_pixbuf_get_width (folder_icon) != ICON_THUMBNAIL_SIZE) {
int width, height;
gdouble scale;
scale = ((double) ICON_THUMBNAIL_SIZE) / gdk_pixbuf_get_width (folder_icon);
width = ICON_THUMBNAIL_SIZE;
height = scale * gdk_pixbuf_get_height (folder_icon);
retval = gdk_pixbuf_scale_simple (folder_icon, width, height, GDK_INTERP_BILINEAR);
g_object_unref (folder_icon);
} else {
retval = folder_icon;
}
return retval;
} }
static GdkPixbuf * static GdkPixbuf *