diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2011-04-25 13:29:15 -0400 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2011-04-25 13:36:11 -0400 |
| commit | 83a7d27b36120d1ae54a2f5aa4af30f04d470bf2 (patch) | |
| tree | e220152835020ab12e2a0d1907c7e9062b2f0045 | |
| parent | f0d52a7a29ca0b503ed160bd21e4f1a3354f6394 (diff) | |
| download | nautilus-83a7d27b36120d1ae54a2f5aa4af30f04d470bf2.tar.gz | |
icon-container: don't chain up style-updated for the desktop container
Chaining up resets the background to the default color, which is not
what we want for the desktop container.
https://bugzilla.gnome.org/show_bug.cgi?id=648137
| -rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index b025e9cef..3c931a862 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -4187,20 +4187,22 @@ style_updated (GtkWidget *widget) { NautilusIconContainer *container; - GTK_WIDGET_CLASS (nautilus_icon_container_parent_class)->style_updated (widget); - container = NAUTILUS_ICON_CONTAINER (widget); container->details->use_drop_shadows = container->details->drop_shadows_requested; + /* Don't chain up to parent, if this is a desktop container, + * because that resets the background of the window. + */ + if (!nautilus_icon_container_get_is_desktop (container)) { + GTK_WIDGET_CLASS (nautilus_icon_container_parent_class)->style_updated (widget); + } + nautilus_icon_container_theme_changed (NAUTILUS_ICON_CONTAINER (widget)); if (gtk_widget_get_realized (widget)) { invalidate_label_sizes (container); nautilus_icon_container_request_update_all (container); } - - /* Don't chain up to parent, because that sets the background of the window and we're doing - that ourself with some delay, so this would cause flickering */ } static gboolean |