[nautilus/wip/ernestask/gtk4-continued: 11/50] icon-info: Clean up API
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/ernestask/gtk4-continued: 11/50] icon-info: Clean up API
- Date: Sun, 10 Feb 2019 20:09:59 +0000 (UTC)
commit 76cae5cb83106b414563f19dbb971749aeca7435
Author: Ernestas Kulik <ernestask gnome org>
Date: Thu Jul 26 20:57:12 2018 +0300
icon-info: Clean up API
This merges some getter functions into one with additional parameters,
so that duplicate code can be avoided. Additionally, this converts
callers to use textures where possible.
src/nautilus-autorun-software.c | 2 +-
src/nautilus-canvas-container.c | 13 +-
src/nautilus-file.c | 4 +-
src/nautilus-files-view.c | 8 +-
src/nautilus-icon-info.c | 555 +++++++++++++++++++--------------------
src/nautilus-icon-info.h | 44 ++--
src/nautilus-properties-window.c | 27 +-
7 files changed, 304 insertions(+), 349 deletions(-)
---
diff --git a/src/nautilus-autorun-software.c b/src/nautilus-autorun-software.c
index 297261902..97bee79b9 100644
--- a/src/nautilus-autorun-software.c
+++ b/src/nautilus-autorun-software.c
@@ -204,7 +204,7 @@ present_autorun_for_software_dialog (GMount *mount)
icon = g_mount_get_icon (mount);
icon_info = nautilus_icon_info_lookup (icon, 48,
gtk_widget_get_scale_factor (GTK_WIDGET (dialog)));
- texture = nautilus_icon_info_get_texture (icon_info);
+ texture = nautilus_icon_info_get_texture (icon_info, TRUE, -1);
gtk_window_set_icon (GTK_WINDOW (dialog), texture);
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index ee727d6b3..64c5020fa 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -4837,8 +4837,8 @@ nautilus_canvas_container_update_icon (NautilusCanvasContainer *container,
NautilusCanvasContainerDetails *details;
guint icon_size;
guint min_image_size, max_image_size;
- NautilusIconInfo *icon_info;
- GdkPixbuf *pixbuf;
+ g_autoptr (NautilusIconInfo) icon_info = NULL;
+ GdkTexture *texture;
char *editable_text, *additional_text;
if (icon == NULL)
@@ -4863,9 +4863,7 @@ nautilus_canvas_container_update_icon (NautilusCanvasContainer *container,
/* Get the icons. */
icon_info = nautilus_canvas_container_get_icon_images (container, icon->file, icon_size,
icon == details->drop_target);
-
- pixbuf = nautilus_icon_info_get_pixbuf (icon_info);
- g_object_unref (icon_info);
+ texture = nautilus_icon_info_get_texture (icon_info, TRUE, -1);
nautilus_canvas_container_get_icon_text (container,
icon->file,
@@ -4879,10 +4877,7 @@ nautilus_canvas_container_update_icon (NautilusCanvasContainer *container,
"highlighted_for_drop", icon == details->drop_target,
NULL);
- nautilus_canvas_item_set_texture (icon->item, gdk_texture_new_for_pixbuf (pixbuf));
-
- /* Let the pixbufs go. */
- g_object_unref (pixbuf);
+ nautilus_canvas_item_set_texture (icon->item, texture);
g_free (editable_text);
g_free (additional_text);
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 6a67752b2..d050cc148 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -5291,11 +5291,11 @@ nautilus_file_get_icon_pixbuf (NautilusFile *file,
info = nautilus_file_get_icon (file, size, scale, flags);
if (force_size)
{
- pixbuf = nautilus_icon_info_get_pixbuf_at_size (info, size);
+ pixbuf = nautilus_icon_info_get_pixbuf (info, TRUE, size);
}
else
{
- pixbuf = nautilus_icon_info_get_pixbuf (info);
+ pixbuf = nautilus_icon_info_get_pixbuf (info, TRUE, -1);
}
g_object_unref (info);
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 2c2b3754e..304c8194f 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -4820,17 +4820,13 @@ static GdkPixbuf *
get_menu_icon_for_file (NautilusFile *file,
GtkWidget *widget)
{
- NautilusIconInfo *info;
- GdkPixbuf *pixbuf;
int scale;
+ g_autoptr (NautilusIconInfo) info = NULL;
scale = gtk_widget_get_scale_factor (widget);
-
info = nautilus_file_get_icon (file, 16, scale, 0);
- pixbuf = nautilus_icon_info_get_pixbuf_nodefault_at_size (info, 16);
- g_object_unref (info);
- return pixbuf;
+ return nautilus_icon_info_get_pixbuf (info, FALSE, 16);
}
static GList *
diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c
index 568c2d561..62e4fae9b 100644
--- a/src/nautilus-icon-info.c
+++ b/src/nautilus-icon-info.c
@@ -23,20 +23,19 @@ struct _NautilusIconInfo
{
GObject parent;
+ GdkPixbuf *pixbuf;
+
gboolean sole_owner;
gint64 last_use_time;
- GdkPixbuf *pixbuf;
char *icon_name;
- gint orig_scale;
+ int scale_factor;
};
static void schedule_reap_cache (void);
-G_DEFINE_TYPE (NautilusIconInfo,
- nautilus_icon_info,
- G_TYPE_OBJECT);
+G_DEFINE_TYPE (NautilusIconInfo, nautilus_icon_info, G_TYPE_OBJECT);
static void
nautilus_icon_info_init (NautilusIconInfo *icon)
@@ -52,42 +51,42 @@ nautilus_icon_info_is_fallback (NautilusIconInfo *icon)
}
static void
-pixbuf_toggle_notify (gpointer info,
- GObject *object,
- gboolean is_last_ref)
+pixbuf_toggle_notify (gpointer data,
+ GObject *object,
+ gboolean is_last_ref)
{
- NautilusIconInfo *icon = info;
+ NautilusIconInfo *self;
- if (is_last_ref)
+ self = data;
+
+ if (!is_last_ref)
{
- icon->sole_owner = TRUE;
- g_object_remove_toggle_ref (object,
- pixbuf_toggle_notify,
- info);
- icon->last_use_time = g_get_monotonic_time ();
- schedule_reap_cache ();
+ return;
}
+
+ self->sole_owner = TRUE;
+
+ g_object_remove_toggle_ref (object, pixbuf_toggle_notify, self);
+
+ self->last_use_time = g_get_monotonic_time ();
+
+ schedule_reap_cache ();
}
static void
nautilus_icon_info_finalize (GObject *object)
{
- NautilusIconInfo *icon;
+ NautilusIconInfo *self;
- icon = NAUTILUS_ICON_INFO (object);
+ self = NAUTILUS_ICON_INFO (object);
- if (!icon->sole_owner && icon->pixbuf)
+ if (!self->sole_owner && self->pixbuf != NULL)
{
- g_object_remove_toggle_ref (G_OBJECT (icon->pixbuf),
- pixbuf_toggle_notify,
- icon);
+ g_object_remove_toggle_ref (G_OBJECT (self->pixbuf), pixbuf_toggle_notify, self);
}
- if (icon->pixbuf)
- {
- g_object_unref (icon->pixbuf);
- }
- g_free (icon->icon_name);
+ g_clear_object (&self->pixbuf);
+ g_clear_pointer (&self->icon_name, g_free);
G_OBJECT_CLASS (nautilus_icon_info_parent_class)->finalize (object);
}
@@ -104,55 +103,56 @@ nautilus_icon_info_class_init (NautilusIconInfoClass *icon_info_class)
NautilusIconInfo *
nautilus_icon_info_new_for_pixbuf (GdkPixbuf *pixbuf,
- gint scale)
+ int scale_factor)
{
- NautilusIconInfo *icon;
+ NautilusIconInfo *info;
- icon = g_object_new (NAUTILUS_TYPE_ICON_INFO, NULL);
+ g_return_val_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf), NULL);
- if (pixbuf)
- {
- icon->pixbuf = g_object_ref (pixbuf);
- }
+ info = g_object_new (NAUTILUS_TYPE_ICON_INFO, NULL);
+
+ g_set_object (&info->pixbuf, pixbuf);
- icon->orig_scale = scale;
+ info->scale_factor = scale_factor;
- return icon;
+ return info;
}
static NautilusIconInfo *
nautilus_icon_info_new_for_icon_info (GtkIconInfo *icon_info,
- gint scale)
+ int scale_factor)
{
- NautilusIconInfo *icon;
+ NautilusIconInfo *info;
+ GdkPixbuf *pixbuf;
const char *filename;
- char *basename, *p;
-
- icon = g_object_new (NAUTILUS_TYPE_ICON_INFO, NULL);
-
- icon->pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
+ info = g_object_new (NAUTILUS_TYPE_ICON_INFO, NULL);
+ pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
filename = gtk_icon_info_get_filename (icon_info);
if (filename != NULL)
{
+ char *basename;
+ char *extension;
+
basename = g_path_get_basename (filename);
- p = strrchr (basename, '.');
- if (p)
+ extension = strrchr (basename, '.');
+ if (extension != NULL)
{
- *p = 0;
+ *extension = '\0';
}
- icon->icon_name = basename;
+
+ info->icon_name = basename;
}
- icon->orig_scale = scale;
+ info->pixbuf = pixbuf;
+ info->scale_factor = scale_factor;
- return icon;
+ return info;
}
-
typedef struct
{
- GIcon *icon;
+ GLoadableIcon *icon;
int scale;
int size;
} LoadableIconKey;
@@ -168,8 +168,6 @@ static GHashTable *loadable_icon_cache = NULL;
static GHashTable *themed_icon_cache = NULL;
static guint reap_cache_timeout = 0;
-#define MICROSEC_PER_SEC ((guint64) 1000000L)
-
static guint time_now;
static gboolean
@@ -182,7 +180,7 @@ reap_old_icon (gpointer key,
if (icon->sole_owner)
{
- if (time_now - icon->last_use_time > 30 * MICROSEC_PER_SEC)
+ if (time_now - icon->last_use_time > 30 * G_TIME_SPAN_SECOND)
{
/* This went unused 30 secs ago. reap */
return TRUE;
@@ -256,25 +254,37 @@ nautilus_icon_info_clear_caches (void)
}
}
-static guint
-loadable_icon_key_hash (LoadableIconKey *key)
+static unsigned int
+loadable_icon_key_hash (gconstpointer key)
{
- return g_icon_hash (key->icon) ^ key->scale ^ key->size;
+ const LoadableIconKey *loadable_icon_key;
+ unsigned int hash;
+
+ loadable_icon_key = key;
+ hash = g_icon_hash (loadable_icon_key->icon);
+
+ return hash ^ loadable_icon_key->scale ^ loadable_icon_key->size;
}
static gboolean
-loadable_icon_key_equal (const LoadableIconKey *a,
- const LoadableIconKey *b)
+loadable_icon_key_equal (gconstpointer a,
+ gconstpointer b)
{
- return a->size == b->size &&
- a->scale == b->scale &&
- g_icon_equal (a->icon, b->icon);
+ const LoadableIconKey *lhs;
+ const LoadableIconKey *rhs;
+
+ lhs = a;
+ rhs = b;
+
+ return lhs->size == rhs->size &&
+ lhs->scale == rhs->scale &&
+ g_icon_equal (G_ICON (lhs->icon), G_ICON (rhs->icon));
}
static LoadableIconKey *
-loadable_icon_key_new (GIcon *icon,
- int scale,
- int size)
+loadable_icon_key_new (GLoadableIcon *icon,
+ int scale,
+ int size)
{
LoadableIconKey *key;
@@ -287,25 +297,39 @@ loadable_icon_key_new (GIcon *icon,
}
static void
-loadable_icon_key_free (LoadableIconKey *key)
+loadable_icon_key_free (gpointer data)
{
+ LoadableIconKey *key;
+
+ key = data;
+
g_object_unref (key->icon);
g_slice_free (LoadableIconKey, key);
}
-static guint
-themed_icon_key_hash (ThemedIconKey *key)
+static unsigned int
+themed_icon_key_hash (gconstpointer key)
{
- return g_str_hash (key->filename) ^ key->size;
+ const ThemedIconKey *themed_icon_key;
+
+ themed_icon_key = key;
+
+ return g_str_hash (themed_icon_key->filename) ^ themed_icon_key->size;
}
static gboolean
-themed_icon_key_equal (const ThemedIconKey *a,
- const ThemedIconKey *b)
+themed_icon_key_equal (gconstpointer a,
+ gconstpointer b)
{
- return a->size == b->size &&
- a->scale == b->scale &&
- g_str_equal (a->filename, b->filename);
+ const ThemedIconKey *lhs;
+ const ThemedIconKey *rhs;
+
+ lhs = a;
+ rhs = b;
+
+ return lhs->size == rhs->size &&
+ lhs->scale == rhs->scale &&
+ g_str_equal (lhs->filename, rhs->filename);
}
static ThemedIconKey *
@@ -324,126 +348,134 @@ themed_icon_key_new (const char *filename,
}
static void
-themed_icon_key_free (ThemedIconKey *key)
+themed_icon_key_free (gpointer data)
{
+ ThemedIconKey *key;
+
+ key = data;
+
g_free (key->filename);
g_slice_free (ThemedIconKey, key);
}
-NautilusIconInfo *
-nautilus_icon_info_lookup (GIcon *icon,
- int size,
- int scale)
+static NautilusIconInfo *
+nautilus_icon_info_look_up_loadable_icon (GLoadableIcon *icon,
+ int size,
+ int scale)
{
- NautilusIconInfo *icon_info;
+ LoadableIconKey lookup_key;
+ g_autoptr (GInputStream) stream = NULL;
+ GdkPixbuf *pixbuf;
+ LoadableIconKey *key;
+ NautilusIconInfo *info;
- if (G_IS_LOADABLE_ICON (icon))
+ if (loadable_icon_cache == NULL)
{
- GdkPixbuf *pixbuf;
- LoadableIconKey lookup_key;
- LoadableIconKey *key;
- GInputStream *stream;
-
- if (loadable_icon_cache == NULL)
- {
- loadable_icon_cache =
- g_hash_table_new_full ((GHashFunc) loadable_icon_key_hash,
- (GEqualFunc) loadable_icon_key_equal,
- (GDestroyNotify) loadable_icon_key_free,
- (GDestroyNotify) g_object_unref);
- }
-
- lookup_key.icon = icon;
- lookup_key.scale = scale;
- lookup_key.size = size * scale;
-
- icon_info = g_hash_table_lookup (loadable_icon_cache, &lookup_key);
- if (icon_info)
- {
- return g_object_ref (icon_info);
- }
-
- pixbuf = NULL;
- stream = g_loadable_icon_load (G_LOADABLE_ICON (icon),
- size * scale,
- NULL, NULL, NULL);
- if (stream)
- {
- pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream,
- size * scale, size * scale,
- TRUE,
- NULL, NULL);
- g_input_stream_close (stream, NULL, NULL);
- g_object_unref (stream);
- }
-
- icon_info = nautilus_icon_info_new_for_pixbuf (pixbuf, scale);
+ loadable_icon_cache = g_hash_table_new_full (loadable_icon_key_hash,
+ loadable_icon_key_equal,
+ loadable_icon_key_free,
+ g_object_unref);
+ }
- key = loadable_icon_key_new (icon, scale, size);
- g_hash_table_insert (loadable_icon_cache, key, icon_info);
+ lookup_key.icon = icon;
+ lookup_key.scale = scale;
+ lookup_key.size = size * scale;
- return g_object_ref (icon_info);
+ info = g_hash_table_lookup (loadable_icon_cache, &lookup_key);
+ if (info != NULL)
+ {
+ return g_object_ref (info);
}
- else if (G_IS_THEMED_ICON (icon))
+ stream = g_loadable_icon_load (icon, size * scale, NULL, NULL, NULL);
+ if (stream != NULL)
{
- const char * const *names;
- ThemedIconKey lookup_key;
- ThemedIconKey *key;
- GtkIconTheme *icon_theme;
- GtkIconInfo *gtkicon_info;
- const char *filename;
-
- if (themed_icon_cache == NULL)
- {
- themed_icon_cache =
- g_hash_table_new_full ((GHashFunc) themed_icon_key_hash,
- (GEqualFunc) themed_icon_key_equal,
- (GDestroyNotify) themed_icon_key_free,
- (GDestroyNotify) g_object_unref);
- }
+ pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream,
+ size * scale, size * scale,
+ TRUE,
+ NULL, NULL);
+ }
+ else
+ {
+ pixbuf = NULL;
+ }
+ key = loadable_icon_key_new (icon, scale, size);
+ info = nautilus_icon_info_new_for_pixbuf (pixbuf, scale);
- names = g_themed_icon_get_names (G_THEMED_ICON (icon));
+ g_hash_table_insert (loadable_icon_cache, key, info);
- icon_theme = gtk_icon_theme_get_default ();
- gtkicon_info = gtk_icon_theme_choose_icon_for_scale (icon_theme, (const char **) names,
- size, scale, GTK_ICON_LOOKUP_FORCE_SIZE);
+ return g_object_ref (info);
+}
- if (gtkicon_info == NULL)
- {
- return nautilus_icon_info_new_for_pixbuf (NULL, scale);
- }
+static NautilusIconInfo *
+nautilus_icon_info_look_up_themed_icon (GThemedIcon *icon,
+ int size,
+ int scale)
+{
+ GtkIconTheme *icon_theme;
+ const char * const *names;
+ g_autoptr (GtkIconInfo) gtkicon_info = NULL;
+ const char *filename;
+ ThemedIconKey lookup_key;
+ ThemedIconKey *key;
+ NautilusIconInfo *info;
- filename = gtk_icon_info_get_filename (gtkicon_info);
- if (filename == NULL)
- {
- g_object_unref (gtkicon_info);
- return nautilus_icon_info_new_for_pixbuf (NULL, scale);
- }
+ if (themed_icon_cache == NULL)
+ {
+ themed_icon_cache = g_hash_table_new_full (themed_icon_key_hash,
+ themed_icon_key_equal,
+ themed_icon_key_free,
+ g_object_unref);
+ }
- lookup_key.filename = (char *) filename;
- lookup_key.scale = scale;
- lookup_key.size = size;
+ icon_theme = gtk_icon_theme_get_default ();
+ names = g_themed_icon_get_names (icon);
+ gtkicon_info = gtk_icon_theme_choose_icon_for_scale (icon_theme, (const char **) names,
+ size, scale,
+ GTK_ICON_LOOKUP_FORCE_SIZE);
+ if (gtkicon_info == NULL)
+ {
+ return nautilus_icon_info_new_for_pixbuf (NULL, scale);
+ }
+ filename = gtk_icon_info_get_filename (gtkicon_info);
+ if (filename == NULL)
+ {
+ return nautilus_icon_info_new_for_pixbuf (NULL, scale);
+ }
- icon_info = g_hash_table_lookup (themed_icon_cache, &lookup_key);
- if (icon_info)
- {
- g_object_unref (gtkicon_info);
- return g_object_ref (icon_info);
- }
+ lookup_key.filename = (char *) filename;
+ lookup_key.scale = scale;
+ lookup_key.size = size;
- icon_info = nautilus_icon_info_new_for_icon_info (gtkicon_info, scale);
+ info = g_hash_table_lookup (themed_icon_cache, &lookup_key);
+ if (info != NULL)
+ {
+ return g_object_ref (info);
+ }
+ key = themed_icon_key_new (filename, scale, size);
+ info = nautilus_icon_info_new_for_icon_info (gtkicon_info, scale);
- key = themed_icon_key_new (filename, scale, size);
- g_hash_table_insert (themed_icon_cache, key, icon_info);
+ g_hash_table_insert (themed_icon_cache, key, info);
- g_object_unref (gtkicon_info);
+ return g_object_ref (info);
+}
- return g_object_ref (icon_info);
+NautilusIconInfo *
+nautilus_icon_info_lookup (GIcon *icon,
+ int size,
+ int scale)
+{
+ if (G_IS_LOADABLE_ICON (icon))
+ {
+ return nautilus_icon_info_look_up_loadable_icon (G_LOADABLE_ICON (icon), size, scale);
+ }
+ else if (G_IS_THEMED_ICON (icon))
+ {
+ return nautilus_icon_info_look_up_themed_icon (G_THEMED_ICON (icon), size, scale);
}
else
{
- GdkPixbuf *pixbuf;
- GtkIconInfo *gtk_icon_info;
+ g_autoptr (GtkIconInfo) gtk_icon_info = NULL;
+ g_autoptr (GdkPixbuf) pixbuf = NULL;
gtk_icon_info = gtk_icon_theme_lookup_by_gicon_for_scale (gtk_icon_theme_get_default (),
icon,
@@ -453,21 +485,9 @@ nautilus_icon_info_lookup (GIcon *icon,
if (gtk_icon_info != NULL)
{
pixbuf = gtk_icon_info_load_icon (gtk_icon_info, NULL);
- g_object_unref (gtk_icon_info);
- }
- else
- {
- pixbuf = NULL;
}
- icon_info = nautilus_icon_info_new_for_pixbuf (pixbuf, scale);
-
- if (pixbuf != NULL)
- {
- g_object_unref (pixbuf);
- }
-
- return icon_info;
+ return nautilus_icon_info_new_for_pixbuf (pixbuf, scale);
}
}
@@ -476,150 +496,101 @@ nautilus_icon_info_lookup_from_name (const char *name,
int size,
int scale)
{
- GIcon *icon;
- NautilusIconInfo *info;
+ g_autoptr (GIcon) icon = NULL;
icon = g_themed_icon_new (name);
- info = nautilus_icon_info_lookup (icon, size, scale);
- g_object_unref (icon);
- return info;
-}
-
-NautilusIconInfo *
-nautilus_icon_info_lookup_from_path (const char *path,
- int size,
- int scale)
-{
- GFile *icon_file;
- GIcon *icon;
- NautilusIconInfo *info;
-
- icon_file = g_file_new_for_path (path);
- icon = g_file_icon_new (icon_file);
- info = nautilus_icon_info_lookup (icon, size, scale);
- g_object_unref (icon);
- g_object_unref (icon_file);
- return info;
-}
-
-GdkTexture *
-nautilus_icon_info_get_texture (NautilusIconInfo *self)
-{
- g_autoptr (GdkPixbuf) pixbuf = NULL;
- g_return_val_if_fail (NAUTILUS_IS_ICON_INFO (self), NULL);
-
- pixbuf = nautilus_icon_info_get_pixbuf (self);
-
- return gdk_texture_new_for_pixbuf (pixbuf);
+ return nautilus_icon_info_lookup (icon, size, scale);
}
-GdkPixbuf *
-nautilus_icon_info_get_pixbuf_nodefault (NautilusIconInfo *icon)
+static GdkPixbuf *
+nautilus_icon_info_get_pixbuf_nodefault (NautilusIconInfo *self)
{
- GdkPixbuf *res;
+ GdkPixbuf *pixbuf;
- if (icon->pixbuf == NULL)
+ if (self->pixbuf == NULL)
{
- res = NULL;
- }
- else
- {
- res = g_object_ref (icon->pixbuf);
-
- if (icon->sole_owner)
- {
- icon->sole_owner = FALSE;
- g_object_add_toggle_ref (G_OBJECT (res),
- pixbuf_toggle_notify,
- icon);
- }
+ return NULL;
}
- return res;
-}
-
-
-GdkPixbuf *
-nautilus_icon_info_get_pixbuf (NautilusIconInfo *icon)
-{
- GdkPixbuf *res;
+ pixbuf = g_object_ref (self->pixbuf);
- res = nautilus_icon_info_get_pixbuf_nodefault (icon);
- if (res == NULL)
+ if (self->sole_owner)
{
- res = gdk_pixbuf_new_from_resource ("/org/gnome/nautilus/text-x-preview.png",
- NULL);
+ self->sole_owner = FALSE;
+
+ g_object_add_toggle_ref (G_OBJECT (pixbuf), pixbuf_toggle_notify, self);
}
- return res;
+ return pixbuf;
}
GdkPixbuf *
-nautilus_icon_info_get_pixbuf_nodefault_at_size (NautilusIconInfo *icon,
- gsize forced_size)
+nautilus_icon_info_get_pixbuf (NautilusIconInfo *self,
+ gboolean fallback,
+ int size)
{
- GdkPixbuf *pixbuf, *scaled_pixbuf;
- int w, h, s;
- double scale;
-
- pixbuf = nautilus_icon_info_get_pixbuf_nodefault (icon);
+ GdkPixbuf *pixbuf;
+ pixbuf = nautilus_icon_info_get_pixbuf_nodefault (self);
if (pixbuf == NULL)
{
- return NULL;
- }
+ if (!fallback)
+ {
+ return pixbuf;
+ }
- w = gdk_pixbuf_get_width (pixbuf) / icon->orig_scale;
- h = gdk_pixbuf_get_height (pixbuf) / icon->orig_scale;
- s = MAX (w, h);
- if (s == forced_size)
- {
- return pixbuf;
+ pixbuf = gdk_pixbuf_new_from_resource ("/org/gnome/nautilus/text-x-preview.png",
+ NULL);
}
- scale = (double) forced_size / s;
- scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
- w * scale, h * scale,
- GDK_INTERP_BILINEAR);
- g_object_unref (pixbuf);
- return scaled_pixbuf;
-}
+ g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+ if (size != -1)
+ {
+ int width;
+ int height;
+ int max;
+ double scale_factor;
+
+ width = gdk_pixbuf_get_width (pixbuf) / self->scale_factor;
+ height = gdk_pixbuf_get_height (pixbuf) / self->scale_factor;
+ max = MAX (width, height);
+ if (max == size)
+ {
+ return pixbuf;
+ }
+ scale_factor = (double) size / (double) max;
-GdkPixbuf *
-nautilus_icon_info_get_pixbuf_at_size (NautilusIconInfo *icon,
- gsize forced_size)
-{
- GdkPixbuf *pixbuf, *scaled_pixbuf;
- int w, h, s;
- double scale;
+ g_object_unref (pixbuf);
- pixbuf = nautilus_icon_info_get_pixbuf (icon);
+ width = MAX (width * scale_factor, 1);
+ height = MAX (height * scale_factor, 1);
- w = gdk_pixbuf_get_width (pixbuf) / icon->orig_scale;
- h = gdk_pixbuf_get_height (pixbuf) / icon->orig_scale;
- s = MAX (w, h);
- if (s == forced_size)
- {
- return pixbuf;
+ pixbuf = gdk_pixbuf_scale_simple (pixbuf,
+ width, height,
+ GDK_INTERP_BILINEAR);
}
- scale = (double) forced_size / s;
+ return pixbuf;
+}
+
+GdkTexture *
+nautilus_icon_info_get_texture (NautilusIconInfo *self,
+ gboolean fallback,
+ int size)
+{
+ g_autoptr (GdkPixbuf) pixbuf = NULL;
- /* Neither of these can be 0. */
- w = MAX (w * scale, 1);
- h = MAX (h * scale, 1);
+ pixbuf = nautilus_icon_info_get_pixbuf (self, fallback, size);
- scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
- w, h,
- GDK_INTERP_BILINEAR);
- g_object_unref (pixbuf);
- return scaled_pixbuf;
+ return gdk_texture_new_for_pixbuf (pixbuf);
}
const char *
-nautilus_icon_info_get_used_name (NautilusIconInfo *icon)
+nautilus_icon_info_get_used_name (NautilusIconInfo *self)
{
- return icon->icon_name;
+ g_return_val_if_fail (NAUTILUS_IS_ICON_INFO (self), NULL);
+
+ return self->icon_name;
}
diff --git a/src/nautilus-icon-info.h b/src/nautilus-icon-info.h
index 8fd5e4c7a..8cb3e2f30 100644
--- a/src/nautilus-icon-info.h
+++ b/src/nautilus-icon-info.h
@@ -17,27 +17,27 @@ G_BEGIN_DECLS
#define NAUTILUS_TYPE_ICON_INFO (nautilus_icon_info_get_type ())
G_DECLARE_FINAL_TYPE (NautilusIconInfo, nautilus_icon_info, NAUTILUS, ICON_INFO, GObject)
-NautilusIconInfo * nautilus_icon_info_new_for_pixbuf (GdkPixbuf *pixbuf,
- int scale);
-NautilusIconInfo * nautilus_icon_info_lookup (GIcon *icon,
- int size,
- int scale);
-NautilusIconInfo * nautilus_icon_info_lookup_from_name (const char *name,
- int size,
- int scale);
-NautilusIconInfo * nautilus_icon_info_lookup_from_path (const char *path,
- int size,
- int scale);
-gboolean nautilus_icon_info_is_fallback (NautilusIconInfo *icon);
-GdkTexture *nautilus_icon_info_get_texture (NautilusIconInfo *icon);
-GdkPixbuf * nautilus_icon_info_get_pixbuf (NautilusIconInfo *icon);
-GdkPixbuf * nautilus_icon_info_get_pixbuf_nodefault (NautilusIconInfo *icon);
-GdkPixbuf * nautilus_icon_info_get_pixbuf_nodefault_at_size (NautilusIconInfo *icon,
- gsize forced_size);
-GdkPixbuf * nautilus_icon_info_get_pixbuf_at_size (NautilusIconInfo *icon,
- gsize forced_size);
-const char * nautilus_icon_info_get_used_name (NautilusIconInfo *icon);
-
-void nautilus_icon_info_clear_caches (void);
+gboolean nautilus_icon_info_is_fallback (NautilusIconInfo *info);
+
+GdkPixbuf *nautilus_icon_info_get_pixbuf (NautilusIconInfo *info,
+ gboolean fallback,
+ int size);
+GdkTexture *nautilus_icon_info_get_texture (NautilusIconInfo *info,
+ gboolean fallback,
+ int size);
+
+const char *nautilus_icon_info_get_used_name (NautilusIconInfo *info);
+
+void nautilus_icon_info_clear_caches (void);
+
+NautilusIconInfo *nautilus_icon_info_lookup (GIcon *icon,
+ int size,
+ int scale);
+NautilusIconInfo *nautilus_icon_info_lookup_from_name (const char *name,
+ int size,
+ int scale);
+
+NautilusIconInfo *nautilus_icon_info_new_for_pixbuf (GdkPixbuf *pixbuf,
+ int scale);
G_END_DECLS
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 82934b728..f8c697cb1 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -327,9 +327,10 @@ add_prompt_and_separator (GtkWidget *vbox,
static void
get_image_for_properties_window (NautilusPropertiesWindow *window,
char **icon_name,
- GdkPixbuf **icon_pixbuf)
+ GdkTexture **texture)
{
- NautilusIconInfo *icon, *new_icon;
+ g_autoptr (NautilusIconInfo) icon = NULL;
+ NautilusIconInfo *new_icon;
GList *l;
gint icon_scale;
@@ -376,22 +377,20 @@ get_image_for_properties_window (NautilusPropertiesWindow *window,
*icon_name = g_strdup (nautilus_icon_info_get_used_name (icon));
}
- if (icon_pixbuf != NULL)
+ if (texture != NULL)
{
- *icon_pixbuf = nautilus_icon_info_get_pixbuf_at_size (icon, NAUTILUS_CANVAS_ICON_SIZE_SMALL);
+ *texture = nautilus_icon_info_get_texture (icon, TRUE, NAUTILUS_CANVAS_ICON_SIZE_SMALL);
}
-
- g_object_unref (icon);
}
static void
update_properties_window_icon (NautilusPropertiesWindow *window)
{
- GdkPixbuf *pixbuf;
- char *name;
+ g_autofree char *name = NULL;
+ g_autoptr (GdkTexture) texture = NULL;
- get_image_for_properties_window (window, &name, &pixbuf);
+ get_image_for_properties_window (window, &name, &texture);
if (name != NULL)
{
@@ -399,17 +398,11 @@ update_properties_window_icon (NautilusPropertiesWindow *window)
}
else
{
- g_autoptr (GdkTexture) texture = NULL;
-
- texture = gdk_texture_new_for_pixbuf (pixbuf);
-
gtk_window_set_icon (GTK_WINDOW (window), texture);
}
- gtk_image_set_from_pixbuf (GTK_IMAGE (window->icon_image), pixbuf);
-
- g_free (name);
- g_object_unref (pixbuf);
+ gtk_image_set_from_paintable (GTK_IMAGE (window->icon_image),
+ GDK_PAINTABLE (texture));
}
/* utility to test if a uri refers to a local image */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
