summaryrefslogtreecommitdiff
path: root/eel
diff options
context:
space:
mode:
authorAlexei Sorokin <[email protected]>2017-03-27 12:07:48 +0300
committerAlexei Sorokin <[email protected]>2017-03-27 12:07:48 +0300
commitdedfcf46269792f1fa112d6236226f17d7d8050d (patch)
tree28cf70bbd3f1dd45f1345d7952f26d1109fd3ac1 /eel
parentf6e841f9161b6b943b987a8dd7c13ed16bca13a3 (diff)
downloadcaja-dedfcf46269792f1fa112d6236226f17d7d8050d.tar.bz2
caja-dedfcf46269792f1fa112d6236226f17d7d8050d.tar.xz
[GTK+2] eel: Revert to set_back_pixmap for directories too
Fixes #752
Diffstat (limited to 'eel')
-rw-r--r--eel/eel-background.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/eel/eel-background.c b/eel/eel-background.c
index 98b26176..ae95828a 100644
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -675,32 +675,36 @@ eel_background_set_up_widget (EelBackground *self)
window = gtk_widget_get_window (widget);
}
+#if !GTK_CHECK_VERSION (3, 0, 0)
+ if (self->details->bg_surface != NULL)
+ {
+ gdk_window_set_back_pixmap (window,
+ self->details->bg_surface, FALSE);
+ }
+ else
+ {
+ GdkColor color = self->details->default_color;
+ make_color_inactive (self, &color);
+ gdk_window_set_background (window, &color);
+ }
+ gdk_window_invalidate_rect (window, NULL, TRUE);
+
+#endif
if (self->details->is_desktop)
{
-#if !GTK_CHECK_VERSION (3, 22, 0)
+#if GTK_CHECK_VERSION (3, 0, 0) && !GTK_CHECK_VERSION (3, 22, 0)
if (self->details->bg_surface != NULL)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
cairo_pattern_t *pattern =
cairo_pattern_create_for_surface (self->details->bg_surface);
gdk_window_set_background_pattern (window, pattern);
cairo_pattern_destroy (pattern);
-#else
- gdk_window_set_back_pixmap (window,
- self->details->bg_surface, FALSE);
-#endif
}
else
{
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkRGBA color = self->details->default_color;
make_color_inactive (self, &color);
gdk_window_set_background_rgba (window, &color);
-#else
- GdkColor color = self->details->default_color;
- make_color_inactive (self, &color);
- gdk_window_set_background (window, &color);
-#endif
}
gdk_window_invalidate_rect (window, NULL, TRUE);
#endif