diff options
| author | infirit <[email protected]> | 2015-07-27 21:41:38 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-07-28 12:44:04 +0200 |
| commit | 9952571f144401f3f943a91a79b388eda1b25a87 (patch) | |
| tree | 0e33f0780fee9ae93c95f7174aaddad74ad58340 | |
| parent | 32655d6612e98c8f97b8e3a4eb5ef91e16a663ad (diff) | |
| download | mate-notification-daemon-9952571f144401f3f943a91a79b388eda1b25a87.tar.bz2 mate-notification-daemon-9952571f144401f3f943a91a79b388eda1b25a87.tar.xz | |
nodoka: Move the draw and expose-event handling from paint_window
No functional change but this makes the code a bit cleaner
and easier to read.
| -rw-r--r-- | src/themes/nodoka/nodoka-theme.c | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/src/themes/nodoka/nodoka-theme.c b/src/themes/nodoka/nodoka-theme.c index 6c2fc0b..4ac4748 100644 --- a/src/themes/nodoka/nodoka-theme.c +++ b/src/themes/nodoka/nodoka-theme.c @@ -593,21 +593,14 @@ update_shape_mask (WindowData* windata) } #endif -static gboolean -paint_window(GtkWidget *widget, -#if GTK_CHECK_VERSION (3, 0, 0) - cairo_t *cr, -#else - GdkEventExpose *event, -#endif - WindowData *windata) +static void +paint_window (GtkWidget *widget, + cairo_t *cr, + WindowData *windata) { cairo_t *cr2; cairo_surface_t *surface; GtkAllocation allocation; -#if !GTK_CHECK_VERSION(3, 0, 0) - cairo_t *cr = gdk_cairo_create (event->window); -#endif if (windata->width == 0 || windata->height == 0) { gtk_widget_get_allocation (windata->win, &allocation); @@ -663,13 +656,29 @@ paint_window(GtkWidget *widget, update_shape_mask (windata); #endif -#if !GTK_CHECK_VERSION (3, 0, 0) - cairo_destroy(cr); -#endif cairo_surface_destroy (surface); +} + +static gboolean +#if GTK_CHECK_VERSION (3, 0, 0) +on_draw (GtkWidget *widget, cairo_t *cr, WindowData *windata) +{ + paint_window (widget, cr, windata); + + return FALSE; +} +#else +on_expose_event (GtkWidget *widget, GdkEventExpose *event, WindowData *windata) +{ + cairo_t *cr = gdk_cairo_create (event->window); + + paint_window (widget, cr, windata); + + cairo_destroy (cr); return FALSE; } +#endif /* Event handlers */ static gboolean @@ -858,11 +867,9 @@ create_notification(UrlClickedCb url_clicked) gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 1); #if GTK_CHECK_VERSION (3, 0, 0) - g_signal_connect(G_OBJECT(main_vbox), "draw", - G_CALLBACK(paint_window), windata); + g_signal_connect (G_OBJECT (main_vbox), "draw", G_CALLBACK (on_draw), windata); #else - g_signal_connect(G_OBJECT(main_vbox), "expose_event", - G_CALLBACK(paint_window), windata); + g_signal_connect (G_OBJECT (main_vbox), "expose_event", G_CALLBACK (on_expose_event), windata); #endif windata->top_spacer = gtk_image_new(); |