isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

St: recompute all theme nodes when the icon theme changes

Browse Source 
StWidget considers "same theme node" as an indication that the style
did not change, and skips emitting style-changed in that case. This
means that icon theme changes are not picked up by StIcon.

https://bugzilla.gnome.org/show_bug.cgi?id=689353
This commit is contained in:
Giovanni Campagna 2012-11-30 15:48:37 +01:00 committed by Jasper St. Pierre
parent f47a11f792
commit 208121646c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/st/st-theme-context.c
View File

@ -143,13 +143,6 @@ on_stage_destroy (ClutterStage *stage)
g_object_unref (context); g_object_unref (context);
} }
static gboolean
emit_changed (StThemeContext *context)
{
g_signal_emit (context, signals[CHANGED], 0);
return FALSE;
}
static void static void
st_theme_context_changed (StThemeContext *context) st_theme_context_changed (StThemeContext *context)
{ {
@ -157,12 +150,19 @@ st_theme_context_changed (StThemeContext *context)
context->root_node = NULL; context->root_node = NULL;
g_hash_table_remove_all (context->nodes); g_hash_table_remove_all (context->nodes);
emit_changed (context); g_signal_emit (context, signals[CHANGED], 0);
if (old_root) if (old_root)
g_object_unref (old_root); g_object_unref (old_root);
} }
static gboolean
changed_idle (gpointer userdata)
{
st_theme_context_changed (userdata);
return FALSE;
}
static void static void
on_icon_theme_changed (StTextureCache *cache, on_icon_theme_changed (StTextureCache *cache,
StThemeContext *context) StThemeContext *context)
@ -170,9 +170,9 @@ on_icon_theme_changed (StTextureCache *cache,
/* Note that an icon theme change isn't really a change of the StThemeContext; /* Note that an icon theme change isn't really a change of the StThemeContext;
* the style information has changed. But since the style factors into the * the style information has changed. But since the style factors into the
* icon_name => icon lookup, faking a theme context change is a good way * icon_name => icon lookup, faking a theme context change is a good way
* to force users such as StIcon to look up icons again. Don't bother recreating * to force users such as StIcon to look up icons again.
* the root node, though. */ */
g_idle_add ((GSourceFunc) emit_changed, context); g_idle_add ((GSourceFunc) changed_idle, context);
} }
/** /**