From 680f220fb2ad89a93b1c14773f825830d80d6ffc Mon Sep 17 00:00:00 2001
From: pandusonu2 <pandu.sonu@yahoo.com>
Date: Thu, 21 Jul 2016 23:45:35 +0530
Subject: [PATCH] week-view: draw the hours labels

Draw the hour labels in the sidebar of the week grid.
---
 data/theme/gtk-styles.css  | 11 +++++
 data/ui/week-view.ui       | 20 +++++++-
 src/views/gcal-week-grid.c | 28 -----------
 src/views/gcal-week-view.c | 99 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 126 insertions(+), 32 deletions(-)

diff --git a/data/theme/gtk-styles.css b/data/theme/gtk-styles.css
index 3549750a..45518c9e 100644
--- a/data/theme/gtk-styles.css
+++ b/data/theme/gtk-styles.css
@@ -398,3 +398,14 @@ datechooser day:selected:hover {
 .week-header .margin {
     color: alpha(@theme_fg_color, 0.6);
 }
+
+.week-view {
+    padding: 0px;
+}
+
+.week-view .hours {
+    font-size: 12pt;
+    font-weight: normal;
+    color: alpha(@theme_fg_color, 0.25);
+    padding: 8px;
+}
diff --git a/data/ui/week-view.ui b/data/ui/week-view.ui
index b3b0ac1c..39d48af6 100644
--- a/data/ui/week-view.ui
+++ b/data/ui/week-view.ui
@@ -3,6 +3,9 @@
   <template class="GcalWeekView" parent="GtkBox">
     <property name="visible">True</property>
     <property name="orientation">vertical</property>
+    <style>
+      <class name="week-view" />
+    </style>
     <child>
       <object class="GcalWeekHeader" id="header">
         <property name="visible">True</property>
@@ -16,9 +19,22 @@
           <object class="GtkViewport">
             <property name="visible">True</property>
             <child>
-              <!--<object class="GcalWeekGrid">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-              </object>-->
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkDrawingArea">
+                    <property name="visible">True</property>
+                    <property name="height-request">2568</property>
+                    <signal name="draw" handler="gcal_week_view_draw_hours" object="GcalWeekView" swapped="yes" />
+                  </object>
+                </child>
+                <!--<child>
+                  <object class="GcalWeekGrid">
+                    <property name="visible">True</property>
+                  </object>
+                </child>-->
+              </object>
             </child>
           </object>
         </child>
diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
index c19c97fc..5327ced9 100644
--- a/src/views/gcal-week-grid.c
+++ b/src/views/gcal-week-grid.c
@@ -184,34 +184,6 @@ gcal_week_grid_draw (GtkWidget *widget,
   gtk_style_context_remove_class (context, "current");
   gtk_style_context_restore (context);
 
-  for (i = 0; i < 24; i++)
-    {
-      gchar *hours;
-      if (self->use_24h_format)
-        {
-          hours = g_strdup_printf ("%02d:00", i);
-          pango_layout_set_text (layout, hours, -1);
-        }
-      else
-        {
-          hours = g_strdup_printf ("%02d:00 %s",
-                                   i % 12,
-                                   i < 12 ? _("AM") : _("PM"));
-
-          if (i == 0)
-            pango_layout_set_text (layout, _("Midnight"), -1);
-          else if (i == 12)
-            pango_layout_set_text (layout, _("Noon"), -1);
-          else
-            pango_layout_set_text (layout, hours, -1);
-        }
-
-      cairo_move_to (cr, padding.left, padding.top + (height / 24) * i);
-      pango_cairo_show_layout (cr, layout);
-
-      g_free (hours);
-    }
-
   for (i = 0; i < 7; i++)
     {
       cairo_move_to (cr,
diff --git a/src/views/gcal-week-view.c b/src/views/gcal-week-view.c
index 3e71a9af..02201a48 100644
--- a/src/views/gcal-week-view.c
+++ b/src/views/gcal-week-view.c
@@ -33,8 +33,8 @@
 
 static const double dashed [] =
 {
-  1.0,
-  1.0
+  5.0,
+  6.0
 };
 
 enum
@@ -96,6 +96,10 @@ static void           gcal_week_view_freeze                     (ECalDataModelSu
 
 static void           gcal_week_view_thaw                       (ECalDataModelSubscriber *subscriber);
 
+static gboolean       gcal_week_view_draw_hours                 (GcalWeekView *self,
+                                                                 cairo_t      *cr,
+                                                                 GtkWidget    *widget);
+
 static void           gcal_view_interface_init                  (GcalViewInterface *iface);
 
 static void           gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface);
@@ -288,6 +292,95 @@ gcal_week_view_thaw (ECalDataModelSubscriber *subscriber)
 {
 }
 
+static gboolean
+gcal_week_view_draw_hours (GcalWeekView *self,
+                           cairo_t      *cr,
+                           GtkWidget    *widget)
+{
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GtkBorder padding;
+  GdkRGBA color;
+
+  gint i, width, height;
+
+  PangoLayout *layout;
+  PangoFontDescription *font_desc;
+
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_widget_get_state_flags (widget);
+
+  gtk_style_context_add_class (context, "hours");
+  gtk_style_context_get_color (context, state, &color);
+  gtk_style_context_get_padding (context, state, &padding);
+  gtk_style_context_get (context, state, "font", &font_desc, NULL);
+
+  layout = pango_cairo_create_layout (cr);
+  pango_layout_set_font_description (layout, font_desc);
+  gdk_cairo_set_source_rgba (cr, &color);
+
+  /* Gets the size of the widget */
+  width = gtk_widget_get_allocated_width (widget);
+  height = gtk_widget_get_allocated_height (widget);
+
+  /* Draws the hours in the sidebar */
+  for (i = 0; i < 24; i++)
+    {
+      gchar *hours;
+
+      if (self->use_24h_format)
+        {
+          hours = g_strdup_printf ("%02d:00", i);
+          pango_layout_set_text (layout, hours, -1);
+        }
+      else
+        {
+          hours = g_strdup_printf ("%d %s",
+                                   i % 12,
+                                   i < 12 ? _("AM") : _("PM"));
+
+          if (i == 0)
+            pango_layout_set_text (layout, _("12 PM"), -1);
+          else if (i == 12)
+            pango_layout_set_text (layout, _("12 AM"), -1);
+          else
+            pango_layout_set_text (layout, hours, -1);
+        }
+
+      cairo_move_to (cr, padding.left, (height / 24) * i + (height / 120));
+      pango_cairo_show_layout (cr, layout);
+
+      g_free (hours);
+    }
+
+  cairo_set_line_width (cr, 0.65);
+
+  /* Draws the horizontal complete lines */
+  for (i = 0; i < 24; i++)
+    {
+      cairo_move_to (cr, 0, (height / 24) * i + 0.4);
+      cairo_rel_line_to (cr, width, 0);
+    }
+
+  cairo_stroke (cr);
+
+  cairo_set_dash (cr, dashed, 2, 0);
+
+  /* Draws the horizontal dashed lines */
+  for (i = 0; i < 24; i++)
+    {
+      cairo_move_to (cr, 0, (height / 24) * i + (height / 48) + 0.4);
+      cairo_rel_line_to (cr, width, 0);
+    }
+
+  cairo_stroke (cr);
+
+  pango_font_description_free (font_desc);
+  g_object_unref (layout);
+
+  return FALSE;
+}
+
 static void
 gcal_week_view_class_init (GcalWeekViewClass *klass)
 {
@@ -306,6 +399,8 @@ gcal_week_view_class_init (GcalWeekViewClass *klass)
 
   gtk_widget_class_bind_template_child (widget_class, GcalWeekView, header);
 
+  gtk_widget_class_bind_template_callback (widget_class, gcal_week_view_draw_hours);
+
   gtk_widget_class_set_css_name (widget_class, "calendar-view");
 }