diff options
| author | monsta <[email protected]> | 2018-01-29 17:28:30 +0300 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-01-31 11:47:27 +0100 |
| commit | 26a21fa2cb70a13b7e96ae43d4de825ad7663dc9 (patch) | |
| tree | d61f2df112ee55e68de510d5c95b2531ba1fa922 /eel/eel-background.c | |
| parent | 0045e373ee71efb8ae9979adc4ef88d5dc90b2ea (diff) | |
| download | caja-26a21fa2cb70a13b7e96ae43d4de825ad7663dc9.tar.bz2 caja-26a21fa2cb70a13b7e96ae43d4de825ad7663dc9.tar.xz | |
require GTK+ 3.22 and GLib 2.50
Diffstat (limited to 'eel/eel-background.c')
| -rw-r--r-- | eel/eel-background.c | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/eel/eel-background.c b/eel/eel-background.c index 8de791ec..e9b4b2cf 100644 --- a/eel/eel-background.c +++ b/eel/eel-background.c @@ -80,9 +80,7 @@ struct EelBackgroundDetails gboolean is_active; }; -#if GTK_CHECK_VERSION (3, 22, 0) static GList *desktop_bg_objects = NULL; -#endif static void free_fade (EelBackground *self) @@ -131,14 +129,12 @@ eel_background_finalize (GObject *object) free_background_surface (self); free_fade (self); -#if GTK_CHECK_VERSION (3, 22, 0) if (self->details->is_desktop) { desktop_bg_objects = g_list_remove (desktop_bg_objects, G_OBJECT (self)); } -#endif G_OBJECT_CLASS (eel_background_parent_class)->finalize (object); } @@ -496,22 +492,8 @@ fade_to_surface (EelBackground *self, if (!mate_bg_crossfade_is_started (self->details->fade)) { -#if GTK_CHECK_VERSION (3, 22, 0) mate_bg_crossfade_start_widget (self->details->fade, widget); -#else - GdkWindow *window; - - if (EEL_IS_CANVAS (widget)) - { - window = gtk_layout_get_bin_window (GTK_LAYOUT (widget)); - } - else - { - window = gtk_widget_get_window (widget); - } - mate_bg_crossfade_start (self->details->fade, window); -#endif if (self->details->is_desktop) { g_signal_connect (self->details->fade, @@ -558,22 +540,6 @@ eel_background_set_up_widget (EelBackground *self) if (self->details->is_desktop) { -#if !GTK_CHECK_VERSION (3, 22, 0) - if (self->details->bg_surface != NULL) - { - 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 - { - GdkRGBA color = self->details->default_color; - make_color_inactive (self, &color); - gdk_window_set_background_rgba (window, &color); - } - gdk_window_invalidate_rect (window, NULL, TRUE); -#endif set_root_surface (self, window, gtk_widget_get_screen (widget)); } } @@ -748,9 +714,7 @@ eel_get_widget_background (GtkWidget *widget) { EelBackground *self; gpointer data; -#if GTK_CHECK_VERSION (3, 22, 0) GList *l; -#endif g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); @@ -761,7 +725,7 @@ eel_get_widget_background (GtkWidget *widget) g_assert (EEL_IS_BACKGROUND (data)); return data; } -#if GTK_CHECK_VERSION (3, 22, 0) + /* Check for an existing desktop window background. */ for (l = desktop_bg_objects; l != NULL; l = l->next) { @@ -772,7 +736,6 @@ eel_get_widget_background (GtkWidget *widget) return self; } } -#endif self = eel_background_new (); self->details->widget = widget; @@ -887,14 +850,12 @@ eel_background_set_desktop (EelBackground *self, if (is_desktop) { -#if GTK_CHECK_VERSION (3, 22, 0) self->details->widget = gtk_widget_get_toplevel (self->details->front_widget); desktop_bg_objects = g_list_prepend (desktop_bg_objects, G_OBJECT (self)); -#endif if (gtk_widget_get_realized (self->details->widget)) { widget_realized_setup (self->details->widget, self); @@ -902,11 +863,9 @@ eel_background_set_desktop (EelBackground *self, } else { -#if GTK_CHECK_VERSION (3, 22, 0) desktop_bg_objects = g_list_remove (desktop_bg_objects, G_OBJECT (self)); self->details->widget = self->details->front_widget; -#endif } } @@ -937,12 +896,8 @@ eel_background_is_dark (EelBackground *self) /* only check for the background on the 0th monitor */ GdkScreen *screen = gdk_screen_get_default (); -#if GTK_CHECK_VERSION (3, 22, 0) GdkDisplay *display = gdk_screen_get_display (screen); gdk_monitor_get_geometry (gdk_display_get_monitor (display, 0), &rect); -#else - gdk_screen_get_monitor_geometry (screen, 0, &rect); -#endif return mate_bg_is_dark (self->details->bg, rect.width, rect.height); } |