callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iconhelper: Move function from style context into only user

Browse Source
This commit is contained in:
Benjamin Otte
2015-03-11 21:24:05 +01:00
parent 63f59dde3a
commit 181e58e402
3 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkiconhelper.c
View File

@ -23,6 +23,7 @@
#include <math.h> #include <math.h>
#include "gtkcssenumvalueprivate.h"
#include "gtkiconhelperprivate.h" #include "gtkiconhelperprivate.h"
#include "gtkstylecontextprivate.h" #include "gtkstylecontextprivate.h"
@ -238,14 +239,39 @@ ensure_stated_icon_from_info (GtkIconHelper *self,
static GtkIconLookupFlags static GtkIconLookupFlags
get_icon_lookup_flags (GtkIconHelper *self, GtkStyleContext *context) get_icon_lookup_flags (GtkIconHelper *self, GtkStyleContext *context)
{ {
GtkIconLookupFlags flags = GTK_ICON_LOOKUP_USE_BUILTIN; GtkIconLookupFlags flags;
GtkCssIconStyle icon_style;
GtkStateFlags state;
state = gtk_style_context_get_state (context);
flags = GTK_ICON_LOOKUP_USE_BUILTIN;
if (self->priv->use_fallback) if (self->priv->use_fallback)
flags |= GTK_ICON_LOOKUP_GENERIC_FALLBACK; flags |= GTK_ICON_LOOKUP_GENERIC_FALLBACK;
if (self->priv->pixel_size != -1 || self->priv->force_scale_pixbuf) if (self->priv->pixel_size != -1 || self->priv->force_scale_pixbuf)
flags |= GTK_ICON_LOOKUP_FORCE_SIZE; flags |= GTK_ICON_LOOKUP_FORCE_SIZE;
flags |= _gtk_style_context_get_icon_lookup_flags (context); 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;
return flags; return flags;
} }

36
gtk/gtkstylecontext.c
View File

@ -3842,42 +3842,6 @@ _gtk_style_context_get_icon_extents (GtkStyleContext *context,
extents->height += border.top + border.bottom; extents->height += border.top + border.bottom;
} }
GtkIconLookupFlags
_gtk_style_context_get_icon_lookup_flags (GtkStyleContext *context)
{
GtkCssIconStyle icon_style;
GtkIconLookupFlags flags;
GtkStateFlags state;
g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), 0);
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:
flags = 0;
break;
default:
g_assert_not_reached ();
return 0;
}
state = gtk_style_context_get_state (context);
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;
return flags;
}
static AtkAttributeSet * static AtkAttributeSet *
add_attribute (AtkAttributeSet *attributes, add_attribute (AtkAttributeSet *attributes,
AtkTextAttribute attr, AtkTextAttribute attr,

1
gtk/gtkstylecontextprivate.h
View File

@ -66,7 +66,6 @@ void _gtk_style_context_get_icon_extents (GtkStyleContext
gint y, gint y,
gint width, gint width,
gint height); gint height);
GtkIconLookupFlags _gtk_style_context_get_icon_lookup_flags (GtkStyleContext *context);
/* Accessibility support */ /* Accessibility support */
AtkAttributeSet *_gtk_style_context_get_attributes (AtkAttributeSet *attributes, AtkAttributeSet *_gtk_style_context_get_attributes (AtkAttributeSet *attributes,