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

1164 lines
29 KiB
C
Raw Normal View History

icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
/* GTK - The GIMP Toolkit
* Copyright (C) 2011 Red Hat, Inc.
*
* Authors: Cosimo Cecchi <cosimoc@gnome.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
Change FSF Address
2012-02-27 13:01:10 +00:00
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
*/
#include "config.h"
iconhelper: Respect -gtk-icon-style This allows styling of entry icons, treeview pixbufs and images. They can now be forced to be symbolic or regular.
2014-05-10 19:50:37 +00:00
#include "gtkiconhelperprivate.h"
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
#include <math.h>
iconhelper: Respect -gtk-icon-style This allows styling of entry icons, treeview pixbufs and images. They can now be forced to be symbolic or regular.
2014-05-10 19:50:37 +00:00
iconhelper: Move function from style context into only user
2015-03-11 20:24:05 +00:00
#include "gtkcssenumvalueprivate.h"
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
#include "gtkiconhelperprivate.h"
iconhelper: Respect -gtk-icon-style This allows styling of entry icons, treeview pixbufs and images. They can now be forced to be symbolic or regular.
2014-05-10 19:50:37 +00:00
#include "gtkstylecontextprivate.h"
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
struct _GtkIconHelperPrivate {
GtkImageType storage_type;
GtkIconHelper: Add set_window() This is a hint on where the icon will be drawn. It will allow us to pre-allocate cairo surfaces for the right target.
2013-06-24 12:05:27 +00:00
GdkWindow *window;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
GdkPixbuf *orig_pixbuf;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
int orig_pixbuf_scale;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
GdkPixbufAnimation *animation;
GIcon *gicon;
GtkIconSet *icon_set;
gchar *stock_id;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
cairo_surface_t *orig_surface;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
GtkIconSize icon_size;
gint pixel_size;
Add API to force a GtkIconHelper pixbuf rescaling This API is handy in entries and status icons, where the size is limited and independent of the pixbuf size
2012-07-13 13:54:29 +00:00
guint use_fallback : 1;
guint force_scale_pixbuf : 1;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
GdkPixbuf *rendered_pixbuf;
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
GtkStateFlags last_rendered_state;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
cairo_surface_t *rendered_surface;
gint rendered_surface_width;
gint rendered_surface_height;
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
GtkStateFlags last_surface_state;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
gint last_surface_scale;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
};
gtk: Use new macros for defining private data https://bugzilla.gnome.org/show_bug.cgi?id=702996
2013-06-27 19:02:52 +00:00
G_DEFINE_TYPE_WITH_PRIVATE (GtkIconHelper, _gtk_icon_helper, G_TYPE_OBJECT)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
void
_gtk_icon_helper_clear (GtkIconHelper *self)
{
g_clear_object (&self->priv->gicon);
g_clear_object (&self->priv->orig_pixbuf);
g_clear_object (&self->priv->animation);
g_clear_object (&self->priv->rendered_pixbuf);
GtkIconHelper: Add set_window() This is a hint on where the icon will be drawn. It will allow us to pre-allocate cairo surfaces for the right target.
2013-06-24 12:05:27 +00:00
g_clear_object (&self->priv->window);
iconhelper: Use g_clear_* helpers https://bugzilla.gnome.org/show_bug.cgi?id=709264
2013-10-02 13:06:36 +00:00
g_clear_pointer (&self->priv->orig_surface, cairo_surface_destroy);
g_clear_pointer (&self->priv->rendered_surface, cairo_surface_destroy);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
if (self->priv->icon_set != NULL)
{
Deprecate GtkIconFactory, GtkIconSet, GtkIconSource We want to use GtkIconTheme instead. It is worth noting that the parts that remain undeprecated are GtkIconSize and gtk_icon_size_lookup.
2013-06-26 22:41:15 +00:00
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
gtk_icon_set_unref (self->priv->icon_set);
Deprecate GtkIconFactory, GtkIconSet, GtkIconSource We want to use GtkIconTheme instead. It is worth noting that the parts that remain undeprecated are GtkIconSize and gtk_icon_size_lookup.
2013-06-26 22:41:15 +00:00
G_GNUC_END_IGNORE_DEPRECATIONS;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
self->priv->icon_set = NULL;
}
iconhelper: Use g_clear_* helpers https://bugzilla.gnome.org/show_bug.cgi?id=709264
2013-10-02 13:06:36 +00:00
g_clear_pointer (&self->priv->stock_id, g_free);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
self->priv->storage_type = GTK_IMAGE_EMPTY;
self->priv->icon_size = GTK_ICON_SIZE_INVALID;
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
self->priv->last_rendered_state = GTK_STATE_FLAG_NORMAL;
self->priv->last_surface_state = GTK_STATE_FLAG_NORMAL;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
self->priv->last_surface_scale = 0;
iconhelper: reset original pixbuf scale on clear Avoids a previously set value for a different image to accidentally stick around. https://bugzilla.gnome.org/show_bug.cgi?id=733416
2014-07-23 04:27:59 +00:00
self->priv->orig_pixbuf_scale = 1;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
void
_gtk_icon_helper_invalidate (GtkIconHelper *self)
{
g_clear_object (&self->priv->rendered_pixbuf);
iconhelper: clear the surface on invalidation This was missed during the pixbuf->surface conversion, so when the state changed we were not recreating a new surface for it.
2013-08-03 16:03:52 +00:00
if (self->priv->rendered_surface != NULL)
{
cairo_surface_destroy (self->priv->rendered_surface);
self->priv->rendered_surface = NULL;
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkIconHelper: Add set_window() This is a hint on where the icon will be drawn. It will allow us to pre-allocate cairo surfaces for the right target.
2013-06-24 12:05:27 +00:00
void
_gtk_icon_helper_set_window (GtkIconHelper *self,
GdkWindow *window)
{
if (window)
g_object_ref (window);
g_clear_object (&self->priv->window);
self->priv->window = window;
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
static void
gtk_icon_helper_finalize (GObject *object)
{
GtkIconHelper *self = GTK_ICON_HELPER (object);
_gtk_icon_helper_clear (self);
G_OBJECT_CLASS (_gtk_icon_helper_parent_class)->finalize (object);
}
static void
_gtk_icon_helper_class_init (GtkIconHelperClass *klass)
{
GObjectClass *oclass;
oclass = G_OBJECT_CLASS (klass);
oclass->finalize = gtk_icon_helper_finalize;
}
static void
_gtk_icon_helper_init (GtkIconHelper *self)
{
gtk: Use new macros for defining private data https://bugzilla.gnome.org/show_bug.cgi?id=702996
2013-06-27 19:02:52 +00:00
self->priv = _gtk_icon_helper_get_instance_private (self);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
self->priv->storage_type = GTK_IMAGE_EMPTY;
self->priv->icon_size = GTK_ICON_SIZE_INVALID;
self->priv->pixel_size = -1;
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
self->priv->last_rendered_state = GTK_STATE_FLAG_NORMAL;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
self->priv->orig_pixbuf_scale = 1;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
static void
ensure_icon_size (GtkIconHelper *self,
GtkStyleContext *context,
gint *width_out,
gint *height_out)
{
gint width, height;
if (self->priv->pixel_size != -1)
{
width = height = self->priv->pixel_size;
}
Deprecate GtkIconFactory, GtkIconSet, GtkIconSource We want to use GtkIconTheme instead. It is worth noting that the parts that remain undeprecated are GtkIconSize and gtk_icon_size_lookup.
2013-06-26 22:41:15 +00:00
else if (!gtk_icon_size_lookup (self->priv->icon_size, &width, &height))
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
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.
2011-11-30 23:32:01 +00:00
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;
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
*width_out = width;
*height_out = height;
}
iconhelper: refactor some code into a single function https://bugzilla.gnome.org/show_bug.cgi?id=705443
2013-08-04 14:56:37 +00:00
static GdkPixbuf *
ensure_stated_pixbuf_from_pixbuf (GtkIconHelper *self,
GtkStyleContext *context,
GdkPixbuf *pixbuf)
{
GdkPixbuf *rendered;
GtkIconSource *source;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
/* FIXME: use gtk_icon_info_load_icon? */
source = gtk_icon_source_new ();
gtk_icon_source_set_pixbuf (source, pixbuf);
/* The size here is arbitrary; since size isn't
* wildcarded in the source, it isn't supposed to be
* scaled by the engine function
*/
gtk_icon_source_set_size (source,
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_icon_source_set_size_wildcarded (source, FALSE);
rendered = gtk_render_icon_pixbuf (context, source, (GtkIconSize) -1);
gtk_icon_source_free (source);
G_GNUC_END_IGNORE_DEPRECATIONS;
return rendered;
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
static GdkPixbuf *
ensure_stated_icon_from_info (GtkIconHelper *self,
GtkStyleContext *context,
GtkIconInfo *info)
{
GdkPixbuf *destination = NULL;
gboolean symbolic;
symbolic = FALSE;
if (info)
destination =
gtk_icon_info_load_symbolic_for_context (info,
context,
&symbolic,
NULL);
if (destination == NULL)
{
Start migrating internals away from GtkStock
2013-06-24 23:28:53 +00:00
GtkIconTheme *icon_theme;
int width;
icon_theme = gtk_icon_theme_get_for_screen (gtk_style_context_get_screen (context));
gtk_icon_size_lookup (self->priv->icon_size, &width, NULL);
destination = gtk_icon_theme_load_icon (icon_theme,
"image-missing",
width,
GTK_ICON_LOOKUP_GENERIC_FALLBACK,
NULL);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
else if (!symbolic)
{
GdkPixbuf *rendered;
iconhelper: refactor some code into a single function https://bugzilla.gnome.org/show_bug.cgi?id=705443
2013-08-04 14:56:37 +00:00
rendered = ensure_stated_pixbuf_from_pixbuf (self, context, destination);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
g_object_unref (destination);
destination = rendered;
}
return destination;
}
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
static gboolean
check_invalidate_pixbuf (GtkIconHelper *self,
GtkStyleContext *context)
{
GtkStateFlags state;
state = gtk_style_context_get_state (context);
if ((self->priv->rendered_pixbuf != NULL) &&
(self->priv->last_rendered_state == state))
return FALSE;
self->priv->last_rendered_state = state;
g_clear_object (&self->priv->rendered_pixbuf);
return TRUE;
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
static GtkIconLookupFlags
iconhelper: Respect -gtk-icon-style This allows styling of entry icons, treeview pixbufs and images. They can now be forced to be symbolic or regular.
2014-05-10 19:50:37 +00:00
get_icon_lookup_flags (GtkIconHelper *self, GtkStyleContext *context)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
iconhelper: Move function from style context into only user
2015-03-11 20:24:05 +00:00
GtkIconLookupFlags flags;
GtkCssIconStyle icon_style;
GtkStateFlags state;
state = gtk_style_context_get_state (context);
flags = GTK_ICON_LOOKUP_USE_BUILTIN;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
if (self->priv->use_fallback)
flags |= GTK_ICON_LOOKUP_GENERIC_FALLBACK;
GtkIconHelper: use FORCE_SCALE when force_scale_pixbuf is set When force_scale_pixbuf is set, the icon helper will scale the icon to the requested size (either the pixel size, or the resolved icon size), so we can just as well instruct the icon theme code to do the scaling for us.
2014-06-22 15:14:41 +00:00
if (self->priv->pixel_size != -1 || self->priv->force_scale_pixbuf)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
flags |= GTK_ICON_LOOKUP_FORCE_SIZE;
iconhelper: Move function from style context into only user
2015-03-11 20:24:05 +00:00
icon_style = _gtk_css_icon_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_STYLE));
switch (icon_style)
{
case GTK_CSS_ICON_STYLE_REGULAR:
flags |= GTK_ICON_LOOKUP_FORCE_REGULAR;
break;
case GTK_CSS_ICON_STYLE_SYMBOLIC:
flags |= GTK_ICON_LOOKUP_FORCE_SYMBOLIC;
break;
case GTK_CSS_ICON_STYLE_REQUESTED:
break;
default:
g_assert_not_reached ();
return 0;
}
if (state & GTK_STATE_FLAG_DIR_LTR)
flags |= GTK_ICON_LOOKUP_DIR_LTR;
else if (state & GTK_STATE_FLAG_DIR_RTL)
flags |= GTK_ICON_LOOKUP_DIR_RTL;
iconhelper: Respect -gtk-icon-style This allows styling of entry icons, treeview pixbufs and images. They can now be forced to be symbolic or regular.
2014-05-10 19:50:37 +00:00
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
return flags;
}
static void
iconhelper: Simplify code In the GTK_IMAGE_ICON_NAME case, instead of keeping around the icon_name, create a GThemedIcon and use that. This way, we can reuse the code paths for the GTK_IMAGE_GICON case.
2014-05-08 16:42:35 +00:00
ensure_pixbuf_for_gicon (GtkIconHelper *self,
GtkStyleContext *context)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
GtkIconTheme *icon_theme;
gint width, height;
GtkIconInfo *info;
GtkIconLookupFlags flags;
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
if (!check_invalidate_pixbuf (self, context))
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
return;
iconhelper: Use the screen's icon theme ... and not the default one.
2015-03-12 00:14:06 +00:00
icon_theme = gtk_icon_theme_get_for_screen (gtk_style_context_get_screen (context));
iconhelper: Respect -gtk-icon-style This allows styling of entry icons, treeview pixbufs and images. They can now be forced to be symbolic or regular.
2014-05-10 19:50:37 +00:00
flags = get_icon_lookup_flags (self, context);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
ensure_icon_size (self, context, &width, &height);
iconhelper: Simplify code In the GTK_IMAGE_ICON_NAME case, instead of keeping around the icon_name, create a GThemedIcon and use that. This way, we can reuse the code paths for the GTK_IMAGE_GICON case.
2014-05-08 16:42:35 +00:00
if (self->priv->gicon != NULL)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
info = gtk_icon_theme_lookup_by_gicon (icon_theme,
self->priv->gicon,
MIN (width, height), flags);
}
else
{
g_assert_not_reached ();
return;
}
self->priv->rendered_pixbuf = ensure_stated_icon_from_info (self, context, info);
if (info)
Fix deprecations for GtkIconInfo
2013-02-16 00:35:44 +00:00
g_object_unref (info);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
static void
ensure_pixbuf_for_icon_set (GtkIconHelper *self,
GtkStyleContext *context,
GtkIconSet *icon_set)
{
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
if (!check_invalidate_pixbuf (self, context))
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
return;
Deprecate GtkIconFactory, GtkIconSet, GtkIconSource We want to use GtkIconTheme instead. It is worth noting that the parts that remain undeprecated are GtkIconSize and gtk_icon_size_lookup.
2013-06-26 22:41:15 +00:00
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
self->priv->rendered_pixbuf =
gtk_icon_set_render_icon_pixbuf (icon_set, context, self->priv->icon_size);
Deprecate GtkIconFactory, GtkIconSet, GtkIconSource We want to use GtkIconTheme instead. It is worth noting that the parts that remain undeprecated are GtkIconSize and gtk_icon_size_lookup.
2013-06-26 22:41:15 +00:00
G_GNUC_END_IGNORE_DEPRECATIONS;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
static void
get_surface_size (GtkIconHelper *self,
GtkStyleContext *context,
cairo_surface_t *surface,
int *width,
int *height)
{
double x_scale, y_scale;
if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE)
{
x_scale = y_scale = 1;
cairo_surface_get_device_scale (surface, &x_scale, &y_scale);
/* Assume any set scaling is icon scale */
*width =
ceil (cairo_image_surface_get_width (surface) / x_scale);
*height =
ceil (cairo_image_surface_get_height (surface) / y_scale);
}
else
ensure_icon_size (self, context, width, height);
}
static void
ensure_pixbuf_from_surface (GtkIconHelper *self,
GtkStyleContext *context)
{
cairo_surface_t *surface;
gint width, height;
cairo_t *cr;
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
if (!check_invalidate_pixbuf (self, context))
return;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
if (self->priv->rendered_pixbuf)
return;
get_surface_size (self, context, self->priv->orig_surface, &width, &height);
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
width, height);
cr = cairo_create (surface);
cairo_set_source_surface (cr, self->priv->orig_surface, 0, 0);
cairo_paint (cr);
cairo_destroy (cr);
self->priv->rendered_pixbuf =
gdk_pixbuf_get_from_surface (surface, 0, 0, width, height);
cairo_surface_destroy (surface);
}
Add API to force a GtkIconHelper pixbuf rescaling This API is handy in entries and status icons, where the size is limited and independent of the pixbuf size
2012-07-13 13:54:29 +00:00
static void
ensure_pixbuf_at_size (GtkIconHelper *self,
GtkStyleContext *context)
{
gint width, height;
iconhelper: always ensure a stated pixbuf Even when we are set a pixbuf itself. https://bugzilla.gnome.org/show_bug.cgi?id=726271
2013-08-04 14:50:31 +00:00
GdkPixbuf *stated;
Add API to force a GtkIconHelper pixbuf rescaling This API is handy in entries and status icons, where the size is limited and independent of the pixbuf size
2012-07-13 13:54:29 +00:00
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
if (!check_invalidate_pixbuf (self, context))
return;
Add API to force a GtkIconHelper pixbuf rescaling This API is handy in entries and status icons, where the size is limited and independent of the pixbuf size
2012-07-13 13:54:29 +00:00
if (self->priv->rendered_pixbuf)
return;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
if (self->priv->force_scale_pixbuf &&
(self->priv->pixel_size != -1 ||
self->priv->icon_size != GTK_ICON_SIZE_INVALID))
Add API to force a GtkIconHelper pixbuf rescaling This API is handy in entries and status icons, where the size is limited and independent of the pixbuf size
2012-07-13 13:54:29 +00:00
{
ensure_icon_size (self, context, &width, &height);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
if (self->priv->orig_pixbuf_scale > 1 ||
/* These should divide the orig_pixbuf size by scale, but need not
due to the above scale > 1 check */
width < gdk_pixbuf_get_width (self->priv->orig_pixbuf) ||
Add API to force a GtkIconHelper pixbuf rescaling This API is handy in entries and status icons, where the size is limited and independent of the pixbuf size
2012-07-13 13:54:29 +00:00
height < gdk_pixbuf_get_height (self->priv->orig_pixbuf))
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
{
width = MIN (width, gdk_pixbuf_get_width (self->priv->orig_pixbuf) / self->priv->orig_pixbuf_scale);
height = MIN (height, gdk_pixbuf_get_height (self->priv->orig_pixbuf) / self->priv->orig_pixbuf_scale);
self->priv->rendered_pixbuf =
gdk_pixbuf_scale_simple (self->priv->orig_pixbuf,
width, height,
GDK_INTERP_BILINEAR);
}
}
else if (self->priv->orig_pixbuf_scale > 1)
{
width = gdk_pixbuf_get_width (self->priv->orig_pixbuf) / self->priv->orig_pixbuf_scale;
height =gdk_pixbuf_get_height (self->priv->orig_pixbuf) / self->priv->orig_pixbuf_scale;
self->priv->rendered_pixbuf =
gdk_pixbuf_scale_simple (self->priv->orig_pixbuf,
width, height,
GDK_INTERP_BILINEAR);
Add API to force a GtkIconHelper pixbuf rescaling This API is handy in entries and status icons, where the size is limited and independent of the pixbuf size
2012-07-13 13:54:29 +00:00
}
if (!self->priv->rendered_pixbuf)
self->priv->rendered_pixbuf = g_object_ref (self->priv->orig_pixbuf);
iconhelper: always ensure a stated pixbuf Even when we are set a pixbuf itself. https://bugzilla.gnome.org/show_bug.cgi?id=726271
2013-08-04 14:50:31 +00:00
stated = ensure_stated_pixbuf_from_pixbuf (self, context, self->priv->rendered_pixbuf);
g_object_unref (self->priv->rendered_pixbuf);
self->priv->rendered_pixbuf = stated;
Add API to force a GtkIconHelper pixbuf rescaling This API is handy in entries and status icons, where the size is limited and independent of the pixbuf size
2012-07-13 13:54:29 +00:00
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
GdkPixbuf *
_gtk_icon_helper_ensure_pixbuf (GtkIconHelper *self,
GtkStyleContext *context)
{
GdkPixbuf *pixbuf = NULL;
GtkIconSet *icon_set;
switch (self->priv->storage_type)
{
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
case GTK_IMAGE_SURFACE:
ensure_pixbuf_from_surface (self, context);
break;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
case GTK_IMAGE_PIXBUF:
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
ensure_pixbuf_at_size (self, context);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
break;
case GTK_IMAGE_STOCK:
Deprecate GtkIconFactory, GtkIconSet, GtkIconSource We want to use GtkIconTheme instead. It is worth noting that the parts that remain undeprecated are GtkIconSize and gtk_icon_size_lookup.
2013-06-26 22:41:15 +00:00
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
iconhelper: Replace function The old one just calls the other one.
2015-03-11 22:01:05 +00:00
icon_set = gtk_icon_factory_lookup_default (self->priv->stock_id);
IconHelper: Avoid warnings for non-existing stock ids There are some registred stock ids like gtk-discards that have no icons, and you could also pass a non-registred stock id. Both of these means gtk_style_context_lookup_icon_set returns NULL, which causes a critical in gtk_icon_set_render_icon_pixbuf. We avoid this by just making these render as EMPTY.
2012-12-13 09:08:37 +00:00
if (icon_set != NULL)
ensure_pixbuf_for_icon_set (self, context, icon_set);
else
pixbuf = NULL;
Deprecate GtkIconFactory, GtkIconSet, GtkIconSource We want to use GtkIconTheme instead. It is worth noting that the parts that remain undeprecated are GtkIconSize and gtk_icon_size_lookup.
2013-06-26 22:41:15 +00:00
G_GNUC_END_IGNORE_DEPRECATIONS;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
break;
case GTK_IMAGE_ICON_SET:
icon_set = self->priv->icon_set;
ensure_pixbuf_for_icon_set (self, context, icon_set);
break;
case GTK_IMAGE_ICON_NAME:
case GTK_IMAGE_GICON:
iconhelper: Simplify code In the GTK_IMAGE_ICON_NAME case, instead of keeping around the icon_name, create a GThemedIcon and use that. This way, we can reuse the code paths for the GTK_IMAGE_GICON case.
2014-05-08 16:42:35 +00:00
ensure_pixbuf_for_gicon (self, context);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
break;
case GTK_IMAGE_ANIMATION:
case GTK_IMAGE_EMPTY:
default:
pixbuf = NULL;
break;
}
if (pixbuf == NULL &&
self->priv->rendered_pixbuf != NULL)
pixbuf = g_object_ref (self->priv->rendered_pixbuf);
return pixbuf;
}
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
static gint
get_scale_factor (GtkIconHelper *self,
GtkStyleContext *context)
{
GdkScreen *screen;
if (self->priv->window)
return gdk_window_get_scale_factor (self->priv->window);
screen = gtk_style_context_get_screen (context);
/* else fall back to something that is more likely to be right than
* just returning 1:
*/
return gdk_screen_get_monitor_scale_factor (screen, 0);
}
static gboolean
check_invalidate_surface (GtkIconHelper *self,
GtkStyleContext *context)
{
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
GtkStateFlags state;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
int scale;
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
state = gtk_style_context_get_state (context);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
scale = get_scale_factor (self, context);
if ((self->priv->rendered_surface != NULL) &&
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
(self->priv->last_surface_state == state) &&
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
(self->priv->last_surface_scale == scale))
return FALSE;
Revert "iconhelper: Don't check states" This reverts commit 63f59dde3a2740057fb24115b58100af630aa453. It turns out, the state was not just necessary for style computation, but also for tracking RTL and LTR. And so it broke the reftests.
2015-03-12 03:31:45 +00:00
self->priv->last_surface_state = state;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
self->priv->last_surface_scale = scale;
if (self->priv->rendered_surface)
cairo_surface_destroy (self->priv->rendered_surface);
self->priv->rendered_surface = NULL;
return TRUE;
}
static void
ensure_surface_from_surface (GtkIconHelper *self,
GtkStyleContext *context)
{
if (!check_invalidate_surface (self, context))
return;
if (self->priv->rendered_surface)
return;
self->priv->rendered_surface =
cairo_surface_reference (self->priv->orig_surface);
get_surface_size (self, context, self->priv->orig_surface,
&self->priv->rendered_surface_width,
&self->priv->rendered_surface_height);
}
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
static gboolean
get_pixbuf_size (GtkIconHelper *self,
GtkStyleContext *context,
gint *width_out,
gint *height_out,
gint *scale_out)
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
{
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
gboolean scale_pixmap;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
gint width, height;
int scale;
scale = get_scale_factor (self, context);
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
scale_pixmap = FALSE;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
if (self->priv->force_scale_pixbuf &&
(self->priv->pixel_size != -1 ||
self->priv->icon_size != GTK_ICON_SIZE_INVALID))
{
ensure_icon_size (self, context, &width, &height);
if (scale != self->priv->orig_pixbuf_scale ||
width < gdk_pixbuf_get_width (self->priv->orig_pixbuf) / self->priv->orig_pixbuf_scale ||
height < gdk_pixbuf_get_height (self->priv->orig_pixbuf) / self->priv->orig_pixbuf_scale)
{
width = MIN (width * scale, gdk_pixbuf_get_width (self->priv->orig_pixbuf) * scale / self->priv->orig_pixbuf_scale);
height = MIN (height * scale, gdk_pixbuf_get_height (self->priv->orig_pixbuf) * scale / self->priv->orig_pixbuf_scale);
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
scale_pixmap = TRUE;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
}
else
{
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
width = gdk_pixbuf_get_width (self->priv->orig_pixbuf);
height = gdk_pixbuf_get_height (self->priv->orig_pixbuf);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
scale = self->priv->orig_pixbuf_scale;
}
}
else
{
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
width = gdk_pixbuf_get_width (self->priv->orig_pixbuf);
height = gdk_pixbuf_get_height (self->priv->orig_pixbuf);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
scale = self->priv->orig_pixbuf_scale;
}
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
*width_out = width;
*height_out = height;
*scale_out = scale;
return scale_pixmap;
}
static void
ensure_surface_from_pixbuf (GtkIconHelper *self,
GtkStyleContext *context)
{
gint width, height;
GdkPixbuf *pixbuf, *stated;
int scale;
if (!check_invalidate_surface (self, context))
return;
if (self->priv->rendered_surface)
return;
if (get_pixbuf_size (self, context, &width, &height, &scale))
pixbuf = gdk_pixbuf_scale_simple (self->priv->orig_pixbuf,
width, height,
GDK_INTERP_BILINEAR);
else
pixbuf = g_object_ref (self->priv->orig_pixbuf);
iconhelper: always ensure a stated pixbuf Even when we are set a pixbuf itself. https://bugzilla.gnome.org/show_bug.cgi?id=726271
2013-08-04 14:50:31 +00:00
stated = ensure_stated_pixbuf_from_pixbuf (self, context, pixbuf);
g_object_unref (pixbuf);
pixbuf = stated;
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
self->priv->rendered_surface_width = (width + scale - 1) / scale;
self->priv->rendered_surface_height = (height + scale - 1) / scale;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
self->priv->rendered_surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale, self->priv->window);
g_object_unref (pixbuf);
}
static void
ensure_surface_for_icon_set (GtkIconHelper *self,
GtkStyleContext *context,
GtkIconSet *icon_set)
{
gint scale;
if (!check_invalidate_surface (self, context))
return;
scale = get_scale_factor (self, context);
Continue the deprecation of GtkIconSet Deprecate gtk_icon_set_render_icon_surface() and gtk_image_get_icon_set(), which take parameters of the deprecated GtkIconSet. https://bugzilla.gnome.org/show_bug.cgi?id=703616
2013-07-05 13:42:31 +00:00
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
self->priv->rendered_surface =
gtk_icon_set_render_icon_surface (icon_set, context,
self->priv->icon_size,
scale, self->priv->window);
Continue the deprecation of GtkIconSet Deprecate gtk_icon_set_render_icon_surface() and gtk_image_get_icon_set(), which take parameters of the deprecated GtkIconSet. https://bugzilla.gnome.org/show_bug.cgi?id=703616
2013-07-05 13:42:31 +00:00
G_GNUC_END_IGNORE_DEPRECATIONS;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
if (self->priv->rendered_surface)
get_surface_size (self, context, self->priv->rendered_surface,
&self->priv->rendered_surface_width,
&self->priv->rendered_surface_height);
}
static void
ensure_stated_surface_from_info (GtkIconHelper *self,
GtkStyleContext *context,
GtkIconInfo *info,
int scale)
{
GdkPixbuf *destination = NULL;
cairo_surface_t *surface;
gboolean symbolic;
symbolic = FALSE;
if (info)
destination =
gtk_icon_info_load_symbolic_for_context (info,
context,
&symbolic,
NULL);
if (destination == NULL)
{
GtkIconSet *icon_set;
Avoid deprecation warning There was one overlooked use of GTK_STOCK_MISSING_IMAGE.
2013-07-03 23:52:11 +00:00
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
iconhelper: Replace function The old one just calls the other one.
2015-03-11 22:01:05 +00:00
icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_MISSING_IMAGE);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
destination =
gtk_icon_set_render_icon_pixbuf (icon_set, context, self->priv->icon_size);
Avoid deprecation warning There was one overlooked use of GTK_STOCK_MISSING_IMAGE.
2013-07-03 23:52:11 +00:00
G_GNUC_END_IGNORE_DEPRECATIONS;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
}
else if (!symbolic)
{
GdkPixbuf *rendered;
iconhelper: refactor some code into a single function https://bugzilla.gnome.org/show_bug.cgi?id=705443
2013-08-04 14:56:37 +00:00
rendered = ensure_stated_pixbuf_from_pixbuf (self, context, destination);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
g_object_unref (destination);
destination = rendered;
}
surface = NULL;
if (destination)
{
surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, self->priv->window);
self->priv->rendered_surface_width =
(gdk_pixbuf_get_width (destination) + scale - 1) / scale;
self->priv->rendered_surface_height =
(gdk_pixbuf_get_height (destination) + scale - 1) / scale;
iconhelper: Fix leak when rendering to cairo surface https://bugzilla.gnome.org/show_bug.cgi?id=709264
2013-10-02 13:33:20 +00:00
g_object_unref (destination);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
}
self->priv->rendered_surface = surface;
}
static void
iconhelper: Simplify code In the GTK_IMAGE_ICON_NAME case, instead of keeping around the icon_name, create a GThemedIcon and use that. This way, we can reuse the code paths for the GTK_IMAGE_GICON case.
2014-05-08 16:42:35 +00:00
ensure_surface_for_gicon (GtkIconHelper *self,
GtkStyleContext *context)
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
{
GtkIconTheme *icon_theme;
gint width, height, scale;
GtkIconInfo *info;
GtkIconLookupFlags flags;
if (!check_invalidate_surface (self, context))
return;
iconhelper: Use the screen's icon theme ... and not the default one.
2015-03-12 00:14:06 +00:00
icon_theme = gtk_icon_theme_get_for_screen (gtk_style_context_get_screen (context));
iconhelper: Respect -gtk-icon-style This allows styling of entry icons, treeview pixbufs and images. They can now be forced to be symbolic or regular.
2014-05-10 19:50:37 +00:00
flags = get_icon_lookup_flags (self, context);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
ensure_icon_size (self, context, &width, &height);
scale = get_scale_factor (self, context);
iconhelper: Simplify code In the GTK_IMAGE_ICON_NAME case, instead of keeping around the icon_name, create a GThemedIcon and use that. This way, we can reuse the code paths for the GTK_IMAGE_GICON case.
2014-05-08 16:42:35 +00:00
if (self->priv->gicon != NULL)
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
{
info = gtk_icon_theme_lookup_by_gicon_for_scale (icon_theme,
self->priv->gicon,
MIN (width, height),
scale, flags);
}
else
{
g_assert_not_reached ();
return;
}
ensure_stated_surface_from_info (self, context, info, scale);
if (info)
g_object_unref (info);
}
cairo_surface_t *
_gtk_icon_helper_ensure_surface (GtkIconHelper *self,
GtkStyleContext *context)
{
cairo_surface_t *surface = NULL;
GtkIconSet *icon_set;
switch (self->priv->storage_type)
{
case GTK_IMAGE_SURFACE:
ensure_surface_from_surface (self, context);
break;
case GTK_IMAGE_PIXBUF:
ensure_surface_from_pixbuf (self, context);
break;
case GTK_IMAGE_STOCK:
Fix some inconsistent deprecations Some functions had only a deprecation comment in the .c file, or only a deprecation annotation in the .h file. Add the missing parts. https://bugzilla.gnome.org/show_bug.cgi?id=703616
2013-07-05 13:17:24 +00:00
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
iconhelper: Replace function The old one just calls the other one.
2015-03-11 22:01:05 +00:00
icon_set = gtk_icon_factory_lookup_default (self->priv->stock_id);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
if (icon_set != NULL)
ensure_surface_for_icon_set (self, context, icon_set);
else
surface = NULL;
Fix some inconsistent deprecations Some functions had only a deprecation comment in the .c file, or only a deprecation annotation in the .h file. Add the missing parts. https://bugzilla.gnome.org/show_bug.cgi?id=703616
2013-07-05 13:17:24 +00:00
G_GNUC_END_IGNORE_DEPRECATIONS;
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
break;
case GTK_IMAGE_ICON_SET:
icon_set = self->priv->icon_set;
ensure_surface_for_icon_set (self, context, icon_set);
break;
case GTK_IMAGE_ICON_NAME:
case GTK_IMAGE_GICON:
iconhelper: Simplify code In the GTK_IMAGE_ICON_NAME case, instead of keeping around the icon_name, create a GThemedIcon and use that. This way, we can reuse the code paths for the GTK_IMAGE_GICON case.
2014-05-08 16:42:35 +00:00
ensure_surface_for_gicon (self, context);
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
break;
case GTK_IMAGE_ANIMATION:
case GTK_IMAGE_EMPTY:
default:
surface = NULL;
break;
}
if (surface == NULL &&
self->priv->rendered_surface != NULL)
surface = cairo_surface_reference (self->priv->rendered_surface);
return surface;
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
void
_gtk_icon_helper_get_size (GtkIconHelper *self,
GtkStyleContext *context,
gint *width_out,
gint *height_out)
{
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
cairo_surface_t *surface;
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
gint width, height, scale;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
width = height = 0;
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
/* Certain kinds of images are easy to calculate the size for, these
we do immediately to avoid having to potentially load the image
data for something that may not yet be visible */
switch (self->priv->storage_type)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
case GTK_IMAGE_SURFACE:
get_surface_size (self, context, self->priv->orig_surface,
&width,
&height);
break;
case GTK_IMAGE_PIXBUF:
get_pixbuf_size (self, context, &width, &height, &scale);
width = (width + scale - 1) / scale;
height = (height + scale - 1) / scale;
break;
case GTK_IMAGE_ICON_NAME:
case GTK_IMAGE_GICON:
if (self->priv->pixel_size != -1 || self->priv->force_scale_pixbuf)
ensure_icon_size (self, context, &width, &height);
break;
case GTK_IMAGE_STOCK:
case GTK_IMAGE_ICON_SET:
case GTK_IMAGE_ANIMATION:
case GTK_IMAGE_EMPTY:
default:
break;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
/* Otherwise we load the surface to guarantee we get a size */
if (width == 0)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
surface = _gtk_icon_helper_ensure_surface (self, context);
if (surface != NULL)
{
width = self->priv->rendered_surface_width;
height = self->priv->rendered_surface_height;
cairo_surface_destroy (surface);
}
else if (self->priv->storage_type == GTK_IMAGE_ANIMATION)
{
width = gdk_pixbuf_animation_get_width (self->priv->animation);
height = gdk_pixbuf_animation_get_height (self->priv->animation);
}
More of the same A similar case in GtkIconHelper. Here we were confusing ourselves, and compared a icon_size against -1, although the variable is never set to -1.
2015-03-22 19:14:42 +00:00
else if (self->priv->icon_size != GTK_ICON_SIZE_INVALID)
GtkIconHelper: Short circuit _gtk_icon_helper_get_size in some cases _gtk_icon_helper_get_size() is often used during size request and may not necessary mean that the icon will be displayed immediately. In many common cases we know the size without having to ensure a surface. In many cases this means we can avoid loading an icon until needed, and in the case of stateless IconHelpers such as GtkCellRendererPixbuf this is very important as otherwise it will constantly be reloading icons if the displayed set is larger than the in-memory icon cache. https://bugzilla.gnome.org/show_bug.cgi?id=734651
2014-08-12 10:34:12 +00:00
{
ensure_icon_size (self, context, &width, &height);
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
if (width_out)
*width_out = width;
if (height_out)
*height_out = height;
}
void
_gtk_icon_helper_set_gicon (GtkIconHelper *self,
GIcon *gicon,
GtkIconSize icon_size)
{
_gtk_icon_helper_clear (self);
if (gicon != NULL)
{
self->priv->storage_type = GTK_IMAGE_GICON;
self->priv->gicon = g_object_ref (gicon);
_gtk_icon_helper_set_icon_size (self, icon_size);
}
}
void
_gtk_icon_helper_set_icon_name (GtkIconHelper *self,
const gchar *icon_name,
GtkIconSize icon_size)
{
_gtk_icon_helper_clear (self);
iconhelper: treat the empty string as a NULL icon name Treat the empty string as if it was a NULL icon name instead of rendering GTK_STOCK_MISSING_IMAGE. This used to be the previous behavior of GtkCellRendererPixbuf and applications might still rely on it.
2011-12-15 19:01:35 +00:00
if (icon_name != NULL &&
iconhelper: small code simplification https://bugzilla.gnome.org/show_bug.cgi?id=687025
2013-01-17 13:43:35 +00:00
icon_name[0] != '\0')
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
self->priv->storage_type = GTK_IMAGE_ICON_NAME;
iconhelper: Simplify code In the GTK_IMAGE_ICON_NAME case, instead of keeping around the icon_name, create a GThemedIcon and use that. This way, we can reuse the code paths for the GTK_IMAGE_GICON case.
2014-05-08 16:42:35 +00:00
self->priv->gicon = g_themed_icon_new (icon_name);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
_gtk_icon_helper_set_icon_size (self, icon_size);
}
}
void
_gtk_icon_helper_set_icon_set (GtkIconHelper *self,
GtkIconSet *icon_set,
GtkIconSize icon_size)
{
_gtk_icon_helper_clear (self);
if (icon_set != NULL)
{
self->priv->storage_type = GTK_IMAGE_ICON_SET;
Deprecate GtkIconFactory, GtkIconSet, GtkIconSource We want to use GtkIconTheme instead. It is worth noting that the parts that remain undeprecated are GtkIconSize and gtk_icon_size_lookup.
2013-06-26 22:41:15 +00:00
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
self->priv->icon_set = gtk_icon_set_ref (icon_set);
Deprecate GtkIconFactory, GtkIconSet, GtkIconSource We want to use GtkIconTheme instead. It is worth noting that the parts that remain undeprecated are GtkIconSize and gtk_icon_size_lookup.
2013-06-26 22:41:15 +00:00
G_GNUC_END_IGNORE_DEPRECATIONS;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
_gtk_icon_helper_set_icon_size (self, icon_size);
}
}
void
_gtk_icon_helper_set_pixbuf (GtkIconHelper *self,
GdkPixbuf *pixbuf)
{
_gtk_icon_helper_clear (self);
if (pixbuf != NULL)
{
self->priv->storage_type = GTK_IMAGE_PIXBUF;
self->priv->orig_pixbuf = g_object_ref (pixbuf);
}
}
void
_gtk_icon_helper_set_animation (GtkIconHelper *self,
GdkPixbufAnimation *animation)
{
_gtk_icon_helper_clear (self);
if (animation != NULL)
{
self->priv->storage_type = GTK_IMAGE_ANIMATION;
self->priv->animation = g_object_ref (animation);
}
}
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
void
_gtk_icon_helper_set_surface (GtkIconHelper *self,
cairo_surface_t *surface)
{
_gtk_icon_helper_clear (self);
if (surface != NULL)
{
self->priv->storage_type = GTK_IMAGE_SURFACE;
self->priv->orig_surface = cairo_surface_reference (surface);
}
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
void
_gtk_icon_helper_set_stock_id (GtkIconHelper *self,
const gchar *stock_id,
GtkIconSize icon_size)
{
_gtk_icon_helper_clear (self);
iconhelper: treat the empty string as a NULL stock-id https://bugzilla.gnome.org/show_bug.cgi?id=687025
2012-10-26 14:32:14 +00:00
if (stock_id != NULL &&
iconhelper: small code simplification https://bugzilla.gnome.org/show_bug.cgi?id=687025
2013-01-17 13:43:35 +00:00
stock_id[0] != '\0')
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
self->priv->storage_type = GTK_IMAGE_STOCK;
self->priv->stock_id = g_strdup (stock_id);
_gtk_icon_helper_set_icon_size (self, icon_size);
}
}
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
gboolean
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
_gtk_icon_helper_set_icon_size (GtkIconHelper *self,
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
GtkIconSize icon_size)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
if (self->priv->icon_size != icon_size)
{
self->priv->icon_size = icon_size;
_gtk_icon_helper_invalidate (self);
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
return TRUE;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
return FALSE;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
gboolean
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
_gtk_icon_helper_set_pixel_size (GtkIconHelper *self,
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
gint pixel_size)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
if (self->priv->pixel_size != pixel_size)
{
self->priv->pixel_size = pixel_size;
_gtk_icon_helper_invalidate (self);
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
return TRUE;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
return FALSE;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
gboolean
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
_gtk_icon_helper_set_use_fallback (GtkIconHelper *self,
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
gboolean use_fallback)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
if (self->priv->use_fallback != use_fallback)
{
self->priv->use_fallback = use_fallback;
_gtk_icon_helper_invalidate (self);
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
return TRUE;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkIconHelper: Change setters to return success This makes it easier to avoid redundant notifications in users.
2014-06-09 12:58:05 +00:00
return FALSE;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkImageType
_gtk_icon_helper_get_storage_type (GtkIconHelper *self)
{
return self->priv->storage_type;
}
gboolean
_gtk_icon_helper_get_use_fallback (GtkIconHelper *self)
{
return self->priv->use_fallback;
}
GtkIconSize
_gtk_icon_helper_get_icon_size (GtkIconHelper *self)
{
return self->priv->icon_size;
}
gint
_gtk_icon_helper_get_pixel_size (GtkIconHelper *self)
{
return self->priv->pixel_size;
}
GdkPixbuf *
_gtk_icon_helper_peek_pixbuf (GtkIconHelper *self)
{
return self->priv->orig_pixbuf;
}
GIcon *
_gtk_icon_helper_peek_gicon (GtkIconHelper *self)
{
return self->priv->gicon;
}
GdkPixbufAnimation *
_gtk_icon_helper_peek_animation (GtkIconHelper *self)
{
return self->priv->animation;
}
GtkIconSet *
_gtk_icon_helper_peek_icon_set (GtkIconHelper *self)
{
return self->priv->icon_set;
}
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
cairo_surface_t *
_gtk_icon_helper_peek_surface (GtkIconHelper *self)
{
return self->priv->orig_surface;
}
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
const gchar *
_gtk_icon_helper_get_stock_id (GtkIconHelper *self)
{
return self->priv->stock_id;
}
const gchar *
_gtk_icon_helper_get_icon_name (GtkIconHelper *self)
{
iconhelper: Simplify code In the GTK_IMAGE_ICON_NAME case, instead of keeping around the icon_name, create a GThemedIcon and use that. This way, we can reuse the code paths for the GTK_IMAGE_GICON case.
2014-05-08 16:42:35 +00:00
if (self->priv->storage_type != GTK_IMAGE_ICON_NAME)
return NULL;
return g_themed_icon_get_names (G_THEMED_ICON (self->priv->gicon))[0];
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
GtkIconHelper *
_gtk_icon_helper_new (void)
{
return g_object_new (GTK_TYPE_ICON_HELPER, NULL);
}
void
_gtk_icon_helper_draw (GtkIconHelper *self,
GtkStyleContext *context,
cairo_t *cr,
gdouble x,
gdouble y)
{
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
cairo_surface_t *surface;
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
surface = _gtk_icon_helper_ensure_surface (self, context);
if (surface != NULL)
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
{
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
gtk_render_icon_surface (context, cr, surface, x, y);
cairo_surface_destroy (surface);
icon-helper: add GtkIconHelper private object GtkIconHelper is a helper object to easily obtain a pixbuf from different icon sources (e.g. a GIcon, an icon name, a stock id, ...). Code is ported from GtkImage, which will be adapted in the next commit.
2011-11-30 03:26:19 +00:00
}
}
gboolean
_gtk_icon_helper_get_is_empty (GtkIconHelper *self)
{
return (self->priv->storage_type == GTK_IMAGE_EMPTY);
}
Add API to force a GtkIconHelper pixbuf rescaling This API is handy in entries and status icons, where the size is limited and independent of the pixbuf size
2012-07-13 13:54:29 +00:00
gboolean
_gtk_icon_helper_get_force_scale_pixbuf (GtkIconHelper *self)
{
return self->priv->force_scale_pixbuf;
}
void
_gtk_icon_helper_set_force_scale_pixbuf (GtkIconHelper *self,
gboolean force_scale)
{
if (self->priv->force_scale_pixbuf != force_scale)
{
self->priv->force_scale_pixbuf = force_scale;
_gtk_icon_helper_invalidate (self);
}
}
GtkIconHelper: Convert to using cairo surfaces as base and support scales We render the source into a cairo_surface_t so that we can render it with cairo directly, rather than having to convert it from a pixbuf every time. We also specify the target window when creating the cairo surface so that rendering can be faster. Using cairo surfaces also allows us to seamlessly support window scales. We also add a GTK_IMAGE_SURFACE source type.
2013-06-24 12:13:43 +00:00
void
_gtk_icon_helper_set_pixbuf_scale (GtkIconHelper *self,
int scale)
{
if (self->priv->orig_pixbuf_scale != scale)
{
self->priv->orig_pixbuf_scale = scale;
_gtk_icon_helper_invalidate (self);
}
}
int
_gtk_icon_helper_get_pixbuf_scale (GtkIconHelper *self)
{
return self->priv->orig_pixbuf_scale;
}
Reference in New Issue Copy Permalink