From 1f021f8da24a0017ea00c511b7ce20769ffee957 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 9 Mar 2016 17:42:21 -0300 Subject: [PATCH] month-view: fix one more child context issue The code for multiday events was broken as well. --- src/gcal-month-view.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gcal-month-view.c b/src/gcal-month-view.c index cba452bb..b964115e 100644 --- a/src/gcal-month-view.c +++ b/src/gcal-month-view.c @@ -1006,7 +1006,7 @@ gcal_month_view_size_allocate (GtkWidget *widget, { GcalSubscriberViewPrivate *ppriv; GcalMonthViewPrivate *priv; - GtkStyleContext *context; + GtkStyleContext *context, *child_context; gint i, j, sw, shown_rows; @@ -1098,6 +1098,7 @@ gcal_month_view_size_allocate (GtkWidget *widget, event = gcal_event_widget_get_event (l->data); uuid = gcal_event_get_uid (event); all_day = gcal_event_get_all_day (event); + child_context = gtk_widget_get_style_context (l->data); if (!gtk_widget_is_visible (child_widget) && !g_hash_table_contains (ppriv->hidden_as_overflow, uuid)) continue; @@ -1194,6 +1195,8 @@ gcal_month_view_size_allocate (GtkWidget *widget, _gcal_subscriber_view_setup_child (GCAL_SUBSCRIBER_VIEW (widget), child_widget); gtk_widget_show (child_widget); + child_context = gtk_widget_get_style_context (child_widget); + aux = g_hash_table_lookup (ppriv->children, uuid); aux = g_list_append (aux, child_widget); } @@ -1220,7 +1223,7 @@ gcal_month_view_size_allocate (GtkWidget *widget, /* Position and allocate the child widget */ gtk_style_context_get_margin (gtk_widget_get_style_context (child_widget), - gtk_style_context_get_state (context), + gtk_style_context_get_state (child_context), &margin); pos_x = cell_width * column + margin.left; @@ -1293,8 +1296,6 @@ gcal_month_view_size_allocate (GtkWidget *widget, if (size_left[i] > natural_height) { - GtkStyleContext *child_context; - child_context = gtk_widget_get_style_context (child_widget); gtk_style_context_get_margin (child_context, gtk_style_context_get_state (child_context), &margin);