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

GtkThemingEngine: Add progress arg to gtk_theming_engine_is_state_set()

Browse Source
This commit is contained in:
Carlos Garnacho
2010-08-19 22:45:22 +02:00
parent 3c07e3d3df
commit 7519ed278b
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkthemingengine.c
View File

@ -314,14 +314,15 @@ gtk_theming_engine_get_state (GtkThemingEngine *engine)
gboolean
gtk_theming_engine_is_state_set (GtkThemingEngine *engine,
GtkStateType state)
GtkStateType state,
gdouble *progress)
{
GtkThemingEnginePrivate *priv;
g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), 0);
priv = engine->priv;
return gtk_style_context_is_state_set (priv->context, state, NULL);
return gtk_style_context_is_state_set (priv->context, state, progress);
}
G_CONST_RETURN GtkWidgetPath *
@ -558,7 +559,7 @@ gtk_theming_engine_render_check (GtkThemingEngine *engine,
else
gdk_cairo_set_source_color (cr, text_color);
if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INCONSISTENT))
if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INCONSISTENT, NULL))
{
int line_thickness = MAX (1, (3 + interior_size * 2) / 7);
@ -569,7 +570,7 @@ gtk_theming_engine_render_check (GtkThemingEngine *engine,
line_thickness);
cairo_fill (cr);
}
else if (gtk_theming_engine_is_state_set (engine, GTK_STATE_ACTIVE))
else if (gtk_theming_engine_is_state_set (engine, GTK_STATE_ACTIVE, NULL))
{
cairo_translate (cr,
x + pad, y + pad);
@ -670,7 +671,7 @@ gtk_theming_engine_render_option (GtkThemingEngine *engine,
/* FIXME: thickness */
thickness = 1;
if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INCONSISTENT))
if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INCONSISTENT, NULL))
{
gint line_thickness;
@ -692,7 +693,7 @@ gtk_theming_engine_render_option (GtkThemingEngine *engine,
line_thickness);
cairo_fill (cr);
}
if (gtk_theming_engine_is_state_set (engine, GTK_STATE_ACTIVE))
if (gtk_theming_engine_is_state_set (engine, GTK_STATE_ACTIVE, NULL))
{
pad = thickness + MAX (1, 2 * (exterior_size - 2 * thickness) / 9);
interior_size = MAX (1, exterior_size - 2 * pad);
@ -1481,7 +1482,7 @@ gtk_theming_engine_render_layout (GtkThemingEngine *engine,
screen = gtk_theming_engine_get_screen (engine);
if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INSENSITIVE))
if (gtk_theming_engine_is_state_set (engine, GTK_STATE_INSENSITIVE, NULL))
{
PangoLayout *insensitive_layout;