GNOME.org
 

[gnome-calendar/wip/pandusonu/week-view: 31/31] week-view, week-grid: various fixed

commit 885ef0e84684cef4bb0dc4fa800bc3ff4c1bd713
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Nov 2 14:05:48 2016 -0200

    week-view, week-grid: various fixed
    
    This commit is a rebase, compile-warning remover and a
    misbehaviour fixer too.

 data/ui/week-header.ui       |    2 +-
 data/ui/week-view.ui         |    8 ++-
 src/gcal-window.c            |    8 +++-
 src/views/gcal-week-grid.c   |  122 +++++++++++++++++++++++++++++++++---------
 src/views/gcal-week-header.c |   16 +++---
 src/views/gcal-week-view.c   |   92 +++++++-------------------------
 6 files changed, 136 insertions(+), 112 deletions(-)
---
diff --git a/data/ui/week-header.ui b/data/ui/week-header.ui
index 06f5172..7552356 100644
--- a/data/ui/week-header.ui
+++ b/data/ui/week-header.ui
@@ -66,7 +66,7 @@
                   <object class="GtkButton" id="expand_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="valign">GTK_ALIGN_END</property>
+                    <property name="valign">end</property>
                     <signal name="clicked" handler="on_expand_action_activated" object="GcalWeekHeader" 
swapped="yes"/>
                     <style>
                       <class name="flat" />
diff --git a/data/ui/week-view.ui b/data/ui/week-view.ui
index 43789d7..075a4c7 100644
--- a/data/ui/week-view.ui
+++ b/data/ui/week-view.ui
@@ -10,12 +10,13 @@
       <object class="GcalWeekHeader" id="header">
         <property name="visible">True</property>
         <property name="active-date" bind-source="GcalWeekView" bind-property="active-date" 
bind-flags="default" />
-        <property name="sidebar-width-offset" bind-source="GcalWeekView" 
bind-property="sidebar-width-offset" bind-flags="default" />
       </object>
     </child>
     <child>
       <object class="GtkScrolledWindow">
         <property name="visible">True</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <child>
           <object class="GtkViewport">
             <property name="visible">True</property>
@@ -28,12 +29,13 @@
                     <property name="visible">True</property>
                     <property name="height-request">2568</property>
                     <signal name="draw" handler="gcal_week_view_draw_hours" object="GcalWeekView" 
swapped="yes" />
-                    <signal name="size-allocate" handler="gcal_week_view_hours_bar_size_allocate" 
object="GcalWeekView" swapped="yes" />
                   </object>
                 </child>
                 <child>
                   <object class="GcalWeekGrid" id="week_grid">
                     <property name="visible">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                   </object>
                 </child>
               </object>
@@ -43,4 +45,4 @@
       </object>
     </child>
   </template>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/src/gcal-window.c b/src/gcal-window.c
index e896f1e..f4ff24e 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -402,10 +402,16 @@ update_active_date (GcalWindow   *window,
     }
 
   /* week_view */
-  g_date_set_dmy (&old_week, previous_date->day, previous_date->month, previous_date->year);
+  g_date_clear (&old_week, 1);
+
+  if (previous_date->day > 0 && previous_date->month > 0 && previous_date->year)
+    g_date_set_dmy (&old_week, previous_date->day, previous_date->month, previous_date->year);
+
+  g_date_clear (&new_week, 1);
   g_date_set_dmy (&new_week, new_date->day, new_date->month, new_date->year);
 
   if (previous_date->year != new_date->year ||
+      !g_date_valid (&old_week) ||
       g_date_get_iso8601_week_of_year (&old_week) != g_date_get_iso8601_week_of_year(&new_week))
     {
       date_start = g_date_time_new_local (new_date->year, new_date->month, new_date->day, 0, 0, 0);
diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
index a9e4546..91db16d 100644
--- a/src/views/gcal-week-grid.c
+++ b/src/views/gcal-week-grid.c
@@ -113,13 +113,7 @@ gcal_week_grid_get_property (GObject    *object,
                              GValue     *value,
                              GParamSpec *pspec)
 {
-  GcalWeekGrid *self = GCAL_WEEK_GRID (object);
-
-  switch (prop_id)
-    {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
+  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 }
 
 static void
@@ -128,13 +122,7 @@ gcal_week_grid_set_property (GObject      *object,
                              const GValue *value,
                              GParamSpec   *pspec)
 {
-  GcalWeekGrid *self = GCAL_WEEK_GRID (object);
-
-  switch (prop_id)
-   {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-   }
+  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 }
 
 static void
@@ -147,11 +135,9 @@ gcal_week_grid_realize (GtkWidget *widget)
   GtkAllocation allocation;
 
   self = GCAL_WEEK_GRID (widget);
-
-  gtk_widget_set_realized (widget, TRUE);
-
   parent_window = gtk_widget_get_parent_window (widget);
 
+  gtk_widget_set_realized (widget, TRUE);
   gtk_widget_set_window (widget, parent_window);
   g_object_ref (parent_window);
 
@@ -164,6 +150,15 @@ gcal_week_grid_realize (GtkWidget *widget)
   attributes.width = allocation.width;
   attributes.height = allocation.height;
   attributes.event_mask = gtk_widget_get_events (widget);
+  attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
+                            GDK_BUTTON_RELEASE_MASK |
+                            GDK_BUTTON1_MOTION_MASK |
+                            GDK_POINTER_MOTION_HINT_MASK |
+                            GDK_POINTER_MOTION_MASK |
+                            GDK_ENTER_NOTIFY_MASK |
+                            GDK_LEAVE_NOTIFY_MASK |
+                            GDK_SCROLL_MASK |
+                            GDK_SMOOTH_SCROLL_MASK);
   attributes_mask = GDK_WA_X | GDK_WA_Y;
 
   self->event_window = gdk_window_new (parent_window,
@@ -179,7 +174,7 @@ gcal_week_grid_unrealize (GtkWidget *widget)
 
   self = GCAL_WEEK_GRID (widget);
 
-  if (self->event_window != NULL)
+  if (self->event_window)
     {
       gtk_widget_unregister_window (widget, self->event_window);
       gdk_window_destroy (self->event_window);
@@ -196,7 +191,7 @@ gcal_week_grid_map (GtkWidget *widget)
 
   self = GCAL_WEEK_GRID (widget);
 
-  if (self->event_window != NULL)
+  if (self->event_window)
     gdk_window_show (self->event_window);
 
   GTK_WIDGET_CLASS (gcal_week_grid_parent_class)->map (widget);
@@ -209,7 +204,7 @@ gcal_week_grid_unmap (GtkWidget *widget)
 
   self = GCAL_WEEK_GRID (widget);
 
-  if (self->event_window != NULL)
+  if (self->event_window)
     gdk_window_hide (self->event_window);
 
   GTK_WIDGET_CLASS (gcal_week_grid_parent_class)->unmap (widget);
@@ -219,7 +214,6 @@ static gboolean
 gcal_week_grid_draw (GtkWidget *widget,
                      cairo_t   *cr)
 {
-  GcalWeekGrid *self;
   GtkStyleContext *context;
   GtkStateFlags state;
   GtkBorder padding;
@@ -230,8 +224,6 @@ gcal_week_grid_draw (GtkWidget *widget,
   PangoLayout *layout;
   PangoFontDescription *font_desc;
 
-  self = GCAL_WEEK_GRID (widget);
-
   context = gtk_widget_get_style_context (widget);
   state = gtk_widget_get_state_flags (widget);
 
@@ -280,11 +272,87 @@ gcal_week_grid_draw (GtkWidget *widget,
 }
 
 static void
+gcal_week_grid_size_allocate (GtkWidget     *widget,
+                              GtkAllocation *allocation)
+{
+  GcalWeekGrid *self = GCAL_WEEK_GRID (widget);
+
+  /* No need to relayout stuff if nothing changed */
+  if (allocation->height == gtk_widget_get_allocated_height (widget) &&
+      allocation->width == gtk_widget_get_allocated_width (widget))
+    {
+      return;
+    }
+
+  /* Allocate the widget */
+  gtk_widget_set_allocation (widget, allocation);
+
+  if (gtk_widget_get_realized (widget))
+    {
+      gdk_window_move_resize (self->event_window,
+                              allocation->x,
+                              allocation->y,
+                              allocation->width,
+                              allocation->height);
+    }
+}
+
+static void
+gcal_week_grid_get_preferred_height (GtkWidget *widget,
+                                     gint      *minimum_height,
+                                     gint      *natural_height)
+{
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GtkBorder padding;
+
+  PangoLayout *layout;
+  PangoFontDescription *font_desc;
+
+  gint hours_12_height, hours_24_height, cell_height, height;
+
+  context = gtk_widget_get_style_context (widget);
+  state = gtk_style_context_get_state (context);
+
+  gtk_style_context_save (context);
+  gtk_style_context_add_class (context, "hours");
+
+  gtk_style_context_get (context, state,
+                         "font", &font_desc,
+                         NULL);
+  gtk_style_context_get_padding (context, state, &padding);
+
+  layout = pango_layout_new (gtk_widget_get_pango_context (widget));
+  pango_layout_set_font_description (layout, font_desc);
+
+  pango_layout_set_text (layout, _("00 AM"), -1);
+  pango_layout_get_pixel_size (layout, NULL, &hours_12_height);
+
+  pango_layout_set_text (layout, _("00:00"), -1);
+  pango_layout_get_pixel_size (layout, NULL, &hours_24_height);
+
+  cell_height = MAX (hours_12_height, hours_24_height) + padding.top + padding.bottom;
+  height = cell_height * 48;
+
+  gtk_style_context_restore (context);
+
+  pango_font_description_free (font_desc);
+  g_object_unref (layout);
+
+  /* Report the height */
+  if (minimum_height)
+    *minimum_height = height;
+
+  if (natural_height)
+    *natural_height = height;
+}
+
+static void
 gcal_week_grid_class_init (GcalWeekGridClass *klass)
 {
   GtkContainerClass *contianer_class = GTK_CONTAINER_CLASS (klass);
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   contianer_class->add = gcal_week_grid_add;
   contianer_class->remove = gcal_week_grid_remove;
@@ -295,10 +363,12 @@ gcal_week_grid_class_init (GcalWeekGridClass *klass)
   object_class->set_property = gcal_week_grid_set_property;
 
   widget_class->draw = gcal_week_grid_draw;
+  widget_class->size_allocate = gcal_week_grid_size_allocate;
   widget_class->realize = gcal_week_grid_realize;
   widget_class->unrealize = gcal_week_grid_unrealize;
   widget_class->map = gcal_week_grid_map;
   widget_class->unmap = gcal_week_grid_unmap;
+  widget_class->get_preferred_height = gcal_week_grid_get_preferred_height;
 
   gtk_widget_class_set_css_name (widget_class, "calendar-view");
 }
@@ -306,7 +376,7 @@ gcal_week_grid_class_init (GcalWeekGridClass *klass)
 static void
 gcal_week_grid_init (GcalWeekGrid *self)
 {
-  gtk_widget_init_template (GTK_WIDGET (self));
+  gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
 }
 
 /* Public API */
@@ -346,4 +416,4 @@ gcal_week_grid_set_current_date (GcalWeekGrid *self,
   self->current_date = gcal_dup_icaltime (current_date);
 
   gtk_widget_queue_draw (GTK_WIDGET (self));
-}
\ No newline at end of file
+}
diff --git a/src/views/gcal-week-header.c b/src/views/gcal-week-header.c
index 6fc625c..4d6f0da 100644
--- a/src/views/gcal-week-header.c
+++ b/src/views/gcal-week-header.c
@@ -763,8 +763,6 @@ gcal_week_header_class_init (GcalWeekHeaderClass *kclass)
 
   widget_class->size_allocate = gcal_week_header_size_allocate;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/week-header.ui");
-
   g_object_class_install_property (object_class,
                                    PROP_ACTIVE_DATE,
                                    g_param_spec_boxed ("active-date",
@@ -780,18 +778,20 @@ gcal_week_header_class_init (GcalWeekHeaderClass *kclass)
                                                      G_MININT, G_MAXINT, 10,
                                                      G_PARAM_READWRITE));
 
-  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, grid);
-  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, month_label);
-  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, year_label);
-  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, week_label);
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/week-header.ui");
+
   gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, draw_area);
-  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, scrolledwindow);
   gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, expand_button);
   gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, expand_button_image);
+  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, grid);
+  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, month_label);
+  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, scrolledwindow);
+  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, week_label);
+  gtk_widget_class_bind_template_child (widget_class, GcalWeekHeader, year_label);
 
+  gtk_widget_class_bind_template_callback (widget_class, fix_background_size_request);
   gtk_widget_class_bind_template_callback (widget_class, gcal_week_header_draw);
   gtk_widget_class_bind_template_callback (widget_class, on_expand_action_activated);
-  gtk_widget_class_bind_template_callback (widget_class, fix_background_size_request);
 
   gtk_widget_class_set_css_name (widget_class, "calendar-view");
 }
diff --git a/src/views/gcal-week-view.c b/src/views/gcal-week-view.c
index 616294c..9ab7fa7 100644
--- a/src/views/gcal-week-view.c
+++ b/src/views/gcal-week-view.c
@@ -40,8 +40,7 @@ static const double dashed [] =
 enum
 {
   PROP_0,
-  PROP_DATE,
-  PROP_SIDEBAR_WIDTH
+  PROP_DATE
 };
 
 struct _GcalWeekView
@@ -58,8 +57,6 @@ struct _GcalWeekView
    */
   gint            first_weekday;
 
-  gint            sidebar_width_offset;
-
   /*
    * clock format from GNOME desktop settings
    */
@@ -98,8 +95,6 @@ static void           gcal_view_interface_init                  (GcalViewInterfa
 
 static void           gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface);
 
-static void           gcal_week_view_constructed                (GObject        *object);
-
 static void           gcal_week_view_finalize                   (GObject        *object);
 
 static void           gcal_week_view_set_property               (GObject        *object,
@@ -173,18 +168,21 @@ gcal_week_view_get_final_date (GcalView *view)
   return new_date;
 }
 
-static gint
-gcal_week_view_get_sidebar_width (GtkWidget *widget)
+static void
+update_hours_sidebar_size (GcalWeekView *self)
 {
   GtkStyleContext *context;
   GtkStateFlags state;
+  GtkWidget *widget;
   GtkBorder padding;
 
   PangoLayout *layout;
   PangoFontDescription *font_desc;
 
   gint hours_12_width, hours_24_width, sidebar_width;
+  gint hours_12_height, hours_24_height, cell_height;
 
+  widget = GTK_WIDGET (self);
   context = gtk_widget_get_style_context (widget);
   state = gtk_style_context_get_state (context);
 
@@ -200,19 +198,23 @@ gcal_week_view_get_sidebar_width (GtkWidget *widget)
   pango_layout_set_font_description (layout, font_desc);
 
   pango_layout_set_text (layout, _("00 AM"), -1);
-  pango_layout_get_pixel_size (layout, &hours_12_width, NULL);
+  pango_layout_get_pixel_size (layout, &hours_12_width, &hours_12_height);
 
   pango_layout_set_text (layout, _("00:00"), -1);
-  pango_layout_get_pixel_size (layout, &hours_24_width, NULL);
+  pango_layout_get_pixel_size (layout, &hours_24_width, &hours_24_height);
 
   sidebar_width = MAX (hours_12_width, hours_24_width) + padding.left + padding.right;
+  cell_height = MAX (hours_12_height, hours_24_height) + padding.top + padding.bottom;
 
   gtk_style_context_restore (context);
 
+  /* Update the size requests */
+  gtk_widget_set_size_request (self->hours_bar,
+                               sidebar_width,
+                               48 * cell_height);
+
   pango_font_description_free (font_desc);
   g_object_unref (layout);
-
-  return sidebar_width;
 }
 
 static void
@@ -288,28 +290,6 @@ gcal_week_view_thaw (ECalDataModelSubscriber *subscriber)
 {
 }
 
-static void
-gcal_week_view_hours_bar_size_allocate (GtkWidget     *widget,
-                                        GtkAllocation *alloc)
-{
-  GcalWeekView *self;
-
-  self = GCAL_WEEK_VIEW (widget);
-
-  if (gcal_week_view_get_sidebar_width (GTK_WIDGET (self)) > self->sidebar_width_offset)
-    {
-      self->sidebar_width_offset = gcal_week_view_get_sidebar_width (GTK_WIDGET (self));
-      g_object_notify (G_OBJECT (self), "sidebar-width-offset");
-    }
-
-  gtk_widget_set_size_request (self->hours_bar, self->sidebar_width_offset, 2568);
-  gtk_widget_set_size_request (self->week_grid,
-                               gtk_widget_get_allocated_width (GTK_WIDGET (self)) - 
self->sidebar_width_offset,
-                               2568);
-
-  GTK_WIDGET_CLASS (gcal_week_view_parent_class)->size_allocate (widget, alloc);
-}
-
 static gboolean
 gcal_week_view_draw_hours (GcalWeekView *self,
                            cairo_t      *cr,
@@ -373,7 +353,7 @@ gcal_week_view_draw_hours (GcalWeekView *self,
 
   cairo_set_line_width (cr, 0.65);
 
-  cairo_move_to (cr, self->sidebar_width_offset, 0);
+  cairo_move_to (cr, gtk_widget_get_allocated_width (self->hours_bar), 0);
   cairo_rel_line_to (cr, 0, height);
 
   /* Draws the horizontal complete lines */
@@ -408,20 +388,11 @@ gcal_week_view_class_init (GcalWeekViewClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  object_class->constructed = gcal_week_view_constructed;
   object_class->finalize = gcal_week_view_finalize;
   object_class->set_property = gcal_week_view_set_property;
   object_class->get_property = gcal_week_view_get_property;
 
-  g_object_class_override_property (object_class,
-                                    PROP_DATE, "active-date");
-  g_object_class_install_property (object_class,
-                                   PROP_SIDEBAR_WIDTH,
-                                   g_param_spec_int ("sidebar-width-offset",
-                                                     "Sidebar Width",
-                                                     "The width of the sidebar",
-                                                     G_MININT, G_MAXINT, 10,
-                                                     G_PARAM_READWRITE));
+  g_object_class_override_property (object_class, PROP_DATE, "active-date");
 
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/week-view.ui");
 
@@ -430,7 +401,6 @@ gcal_week_view_class_init (GcalWeekViewClass *klass)
   gtk_widget_class_bind_template_child (widget_class, GcalWeekView, week_grid);
 
   gtk_widget_class_bind_template_callback (widget_class, gcal_week_view_draw_hours);
-  gtk_widget_class_bind_template_callback (widget_class, gcal_week_view_hours_bar_size_allocate);
 
   gtk_widget_class_set_css_name (widget_class, "calendar-view");
 }
@@ -438,9 +408,9 @@ gcal_week_view_class_init (GcalWeekViewClass *klass)
 static void
 gcal_week_view_init (GcalWeekView *self)
 {
-  self->sidebar_width_offset = 10;
-
   gtk_widget_init_template (GTK_WIDGET (self));
+
+  update_hours_sidebar_size (self);
 }
 
 static void
@@ -463,18 +433,6 @@ gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *ifa
 }
 
 static void
-gcal_week_view_constructed (GObject *object)
-{
-  GcalWeekView *self;
-
-  g_return_if_fail (GCAL_IS_WEEK_VIEW (object));
-  self = GCAL_WEEK_VIEW (object);
-
-  if (G_OBJECT_CLASS (gcal_week_view_parent_class)->constructed != NULL)
-      G_OBJECT_CLASS (gcal_week_view_parent_class)->constructed (object);
-}
-
-static void
 gcal_week_view_finalize (GObject       *object)
 {
   GcalWeekView *self;
@@ -526,14 +484,6 @@ gcal_week_view_set_property (GObject       *object,
         break;
       }
 
-    case PROP_SIDEBAR_WIDTH:
-      {
-        self->sidebar_width_offset = g_value_get_int (value);
-
-        gtk_widget_set_size_request (self->hours_bar, self->sidebar_width_offset, 2568);
-        break;
-      }
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -557,10 +507,6 @@ gcal_week_view_get_property (GObject       *object,
       g_value_set_boxed (value, self->date);
       break;
 
-    case PROP_SIDEBAR_WIDTH:
-      g_value_set_int (value, self->sidebar_width_offset);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -632,4 +578,4 @@ gcal_week_view_set_current_date (GcalWeekView *self,
   gcal_week_header_set_current_date (GCAL_WEEK_HEADER (self->header), current_date);
 
   self->current_date = current_date;
-}
\ No newline at end of file
+}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]