[evolution/clutter-calendar-v2] Draw Top+Time bar under MxWidget and add CSS theme.

[Srinivasa Ragavan <sragavan src gnome org>]

commit d9018cc54de6f94e7e315f053f9b5228b84512fd
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Fri Sep 3 15:55:09 2010 +0530

    Draw Top+Time bar under MxWidget and add CSS theme.

 calendar/gui/e-day-view-clutter-top-item.c |   31 +-----------------------
 calendar/gui/e-day-view-time-item.c        |    2 +-
 calendar/gui/e-day-view.c                  |   35 ++++++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 32 deletions(-)
---
diff --git a/calendar/gui/e-day-view-clutter-top-item.c b/calendar/gui/e-day-view-clutter-top-item.c
index 2951282..a1488be 100644
--- a/calendar/gui/e-day-view-clutter-top-item.c
+++ b/calendar/gui/e-day-view-clutter-top-item.c
@@ -684,7 +684,8 @@ day_view_clutter_top_item_draw (ClutterCairoTexture *canvas_item)
 	light = style->light[GTK_STATE_NORMAL];
 	dark = style->dark[GTK_STATE_NORMAL];
 
-	if (show_dates) {
+	/*TEST: We now paint that through a MxWidget's css. */
+	if (show_dates && 0) {
 		/* Draw the shadow around the dates. */
 		cairo_save (cr);
 		gdk_cairo_set_source_color (cr, &light);
@@ -725,34 +726,6 @@ day_view_clutter_top_item_draw (ClutterCairoTexture *canvas_item)
 		cairo_restore (cr);
 
 		day_view_clutter_top_item_draw_selection (canvas_item);
-#if 0
-		/* Draw the selection background. */
-		if (gtk_widget_has_focus (GTK_WIDGET (day_view))
-			&& day_view->selection_start_day != -1) {
-			gint start_col, end_col, rect_x, rect_y, rect_w, rect_h;
-
-			start_col = day_view->selection_start_day;
-			end_col = day_view->selection_end_day;
-
-			if (end_col > start_col
-			    || day_view->selection_start_row == -1
-			    || day_view->selection_end_row == -1) {
-				rect_x = day_view->day_offsets[start_col];
-				rect_y = 0;
-				rect_w = day_view->day_offsets[end_col + 1] - rect_x;
-				rect_h = canvas_height - 1 - rect_y;
-
-				cairo_save (cr);
-				gdk_cairo_set_source_color (
-					cr, &day_view->colors
-					[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED]);
-				cairo_rectangle (cr, rect_x - x, rect_y - y,
-						 rect_w, rect_h);
-				cairo_fill (cr);
-				cairo_restore (cr);
-			}
-		}
-#endif		
 	}
 
 	if (show_dates) {
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index edc446a..ae95454 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -483,7 +483,7 @@ edvti_draw_zone (GnomeCanvasItem   *canvas_item,
 			/* 60 minute intervals - draw a long horizontal line
 			   between hours and display as one long string,
 			   e.g. "14:00" or "2 pm". */
-			cairo_save (cr);
+			//cairo_save (cr);
 			gdk_cairo_set_source_color (cr, &dark);
 			cairo_save (cr);
 			cairo_set_line_width (cr, 0.7);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 1e82c44..77dc1f3 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1267,6 +1267,8 @@ e_day_view_init (EDayView *day_view)
 				       NULL);
 #if HAVE_CLUTTER
 	} else {
+	ClutterActor *abox;
+
 	day_view->top_dates_canvas_embed = gtk_clutter_embed_new ();
 	gtk_widget_show (day_view->top_dates_canvas_embed);
 	gtk_container_add ((GtkContainer *)day_view->top_dates_canvas, (GtkWidget *)day_view->top_dates_canvas_embed);
@@ -1283,7 +1285,21 @@ e_day_view_init (EDayView *day_view)
 			NULL);
 	clutter_actor_set_reactive (day_view->top_dates_canvas_actor, FALSE);
 	((EDayViewClutterMainItem *)day_view->top_dates_canvas_actor)->stage = day_view->top_dates_canvas_stage;
-	clutter_container_add_actor ((ClutterContainer *)day_view->top_dates_canvas_stage, (ClutterActor *)day_view->top_dates_canvas_actor);
+
+	abox = mx_box_layout_new ();
+	clutter_actor_set_name (abox, "CalendarTitleBox");
+	mx_box_layout_set_orientation ((MxBoxLayout *)abox, MX_ORIENTATION_VERTICAL);
+
+   	mx_box_layout_add_actor (MX_BOX_LAYOUT (abox),
+                               day_view->top_dates_canvas_actor, -1);
+	clutter_container_child_set (CLUTTER_CONTAINER (abox),
+                               day_view->top_dates_canvas_actor,
+			       "expand", TRUE,
+			       "x-fill", TRUE,
+			       "y-fill", TRUE,			       
+                               NULL);
+	clutter_actor_show (abox);
+	clutter_container_add_actor ((ClutterContainer *)day_view->top_dates_canvas_stage, (ClutterActor *)abox);
 	clutter_actor_show ((ClutterActor *)day_view->top_dates_canvas_actor);
 	gtk_widget_set_size_request (day_view->top_dates_canvas, -1, day_view->top_row_height);
 
@@ -1478,6 +1494,7 @@ e_day_view_init (EDayView *day_view)
 				       NULL);
 #if HAVE_CLUTTER
 	} else {
+	ClutterActor *abox = mx_box_layout_new ();
 	day_view->time_canvas_actor = g_object_new (
 			E_TYPE_DAY_VIEW_CLUTTER_TIME_ITEM,
 			"EDayViewClutterTimeItem::day_view", day_view,
@@ -1486,7 +1503,21 @@ e_day_view_init (EDayView *day_view)
 			NULL);
 	clutter_actor_set_reactive ((ClutterActor *)day_view->time_canvas_actor, TRUE);
 	((EDayViewClutterTimeItem *)day_view->time_canvas_actor)->stage = day_view->time_canvas_stage;
-	clutter_container_add_actor ((ClutterContainer *)day_view->time_canvas_stage, (ClutterActor *)day_view->time_canvas_actor);
+	
+
+	clutter_actor_set_name (abox, "CalendarTimeBox");
+	mx_box_layout_set_orientation ((MxBoxLayout *)abox, MX_ORIENTATION_VERTICAL);
+
+   	mx_box_layout_add_actor (MX_BOX_LAYOUT (abox),
+                               day_view->time_canvas_actor, -1);
+	clutter_container_child_set (CLUTTER_CONTAINER (abox),
+                               day_view->time_canvas_actor,
+			       "expand", TRUE,
+			       "x-fill", TRUE,
+			       "y-fill", TRUE,			       
+                               NULL);
+	clutter_actor_show (abox);
+	clutter_container_add_actor ((ClutterContainer *)day_view->time_canvas_stage, (ClutterActor *)abox);
 	clutter_actor_show ((ClutterActor *)day_view->time_canvas_actor);
 	}
 #endif