diff options
| author | Alexei Sorokin <[email protected]> | 2017-01-15 18:24:34 +0300 |
|---|---|---|
| committer | Alexei Sorokin <[email protected]> | 2017-01-15 18:24:34 +0300 |
| commit | 78e6e31dbde35a3f3dd4e95f2d8af90de2c17b1f (patch) | |
| tree | be328fdaee82db6fe18a0544a6434c337a4607a5 /savers | |
| parent | 15d98b9835333ba174687b4ec58eae7bcc7d94e2 (diff) | |
| download | mate-screensaver-78e6e31dbde35a3f3dd4e95f2d8af90de2c17b1f.tar.bz2 mate-screensaver-78e6e31dbde35a3f3dd4e95f2d8af90de2c17b1f.tar.xz | |
avoid deprecated gdk_window_set_background functions
Which are completely broken in GTK+ 3.22.
Also remove some redundant separate Gtk2 code.
Diffstat (limited to 'savers')
| -rw-r--r-- | savers/floaters.c | 5 | ||||
| -rw-r--r-- | savers/gs-theme-engine.c | 66 |
2 files changed, 24 insertions, 47 deletions
diff --git a/savers/floaters.c b/savers/floaters.c index d565d63..0f8883f 100644 --- a/savers/floaters.c +++ b/savers/floaters.c @@ -1103,8 +1103,9 @@ screen_saver_update_state (ScreenSaver *screen_saver, screen_saver_floater_update_state (screen_saver, floater, time); - if (gtk_widget_get_realized (screen_saver->drawing_area) - && (floater->bounds.width > 0) && (floater->bounds.height > 0)) + if (screen_saver->drawing_area != NULL && + gtk_widget_get_realized (screen_saver->drawing_area) && + (floater->bounds.width > 0) && (floater->bounds.height > 0)) { gint size; size = CLAMP ((int) (FLOATER_MAX_SIZE * floater->scale), diff --git a/savers/gs-theme-engine.c b/savers/gs-theme-engine.c index c864df6..b93b02f 100644 --- a/savers/gs-theme-engine.c +++ b/savers/gs-theme-engine.c @@ -107,56 +107,28 @@ gs_theme_engine_get_property (GObject *object, } } -static void -gs_theme_engine_clear (GtkWidget *widget) -{ +static gboolean #if GTK_CHECK_VERSION (3, 0, 0) - GdkRGBA color = { 0.0, 0.0, 0.0, 1.0 }; - GtkStateFlags state; +gs_theme_engine_real_draw (GtkWidget *widget, + cairo_t *cr) #else - GdkColor color = { 0, 0x0000, 0x0000, 0x0000 }; - GdkColormap *colormap; - GtkStyle *style; - GtkStateType state; +gs_theme_engine_real_expose_event (GtkWidget *widget, + GdkEventExpose *event) #endif - - g_return_if_fail (GS_IS_THEME_ENGINE (widget)); - - if (! gtk_widget_get_visible (widget)) - { - return; - } - -#if GTK_CHECK_VERSION (3, 0, 0) - state = gtk_widget_get_state_flags (widget); - gtk_widget_override_background_color (widget, state, &color); - gdk_window_set_background_rgba (gtk_widget_get_window (widget), &color); -#else - style = gtk_widget_get_style (widget); - state = (GtkStateType) 0; - while (state < (GtkStateType) G_N_ELEMENTS (style->bg)) - { - gtk_widget_modify_bg (widget, state, &color); - state++; - } - - colormap = gdk_drawable_get_colormap (gtk_widget_get_window (widget)); - gdk_colormap_alloc_color (colormap, &color, FALSE, TRUE); - gdk_window_set_background (gtk_widget_get_window (widget), &color); - gdk_window_clear (gtk_widget_get_window (widget)); -#endif - gdk_flush (); -} - -static gboolean -gs_theme_engine_real_map_event (GtkWidget *widget, - GdkEventAny *event) { - gboolean handled = FALSE; +#if !GTK_CHECK_VERSION (3, 0, 0) + GdkWindow *window = gtk_widget_get_window (widget); + cairo_t *cr = gdk_cairo_create (window); - gs_theme_engine_clear (widget); +#endif + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + cairo_set_source_rgb (cr, 0, 0, 0); + cairo_paint (cr); - return handled; +#if !GTK_CHECK_VERSION (3, 0, 0) + cairo_destroy (cr); +#endif + return FALSE; } static void @@ -171,7 +143,11 @@ gs_theme_engine_class_init (GSThemeEngineClass *klass) object_class->get_property = gs_theme_engine_get_property; object_class->set_property = gs_theme_engine_set_property; - widget_class->map_event = gs_theme_engine_real_map_event; +#if GTK_CHECK_VERSION (3, 0, 0) + widget_class->draw = gs_theme_engine_real_draw; +#else + widget_class->expose_event = gs_theme_engine_real_expose_event; +#endif g_type_class_add_private (klass, sizeof (GSThemeEnginePrivate)); } |