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

GtkStyle: Listen to context changes.

Browse Source 
This way the GtkStyle is updated to the latest style info, actually
emitting ::style-set must be performed after invalidating the style
context.
This commit is contained in:
Carlos Garnacho 2010-11-03 12:18:48 +01:00
parent 33e95ae65f
commit 920637abef
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkstyle.c
View File

@ -79,6 +79,7 @@ typedef struct _GtkStylePrivate GtkStylePrivate;
struct _GtkStylePrivate { struct _GtkStylePrivate {
GSList *color_hashes; GSList *color_hashes;
GtkStyleContext *context; GtkStyleContext *context;
gulong context_changed_id;
}; };
enum { enum {
@ -610,7 +611,12 @@ gtk_style_finalize (GObject *object)
g_object_unref (style->rc_style); g_object_unref (style->rc_style);
if (priv->context) if (priv->context)
g_object_unref (priv->context); {
if (priv->context_changed_id)
g_signal_handler_disconnect (priv->context, priv->context_changed_id);
g_object_unref (priv->context);
}
G_OBJECT_CLASS (gtk_style_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_style_parent_class)->finalize (object);
} }
@ -735,6 +741,13 @@ gtk_style_update_from_context (GtkStyle *style)
} }
} }
static void
style_context_changed (GtkStyleContext *context,
gpointer user_data)
{
gtk_style_update_from_context (GTK_STYLE (user_data));
}
static void static void
gtk_style_constructed (GObject *object) gtk_style_constructed (GObject *object)
{ {
@ -746,7 +759,8 @@ gtk_style_constructed (GObject *object)
{ {
gtk_style_update_from_context (GTK_STYLE (object)); gtk_style_update_from_context (GTK_STYLE (object));
/* FIXME: Listen to context changes */ priv->context_changed_id = g_signal_connect (priv->context, "changed",
G_CALLBACK (style_context_changed), object);
} }
} }