[gnome-shell/wip/fmuellner/notification-redux: 90/128] Revert "calendar: Use Clutter.GridLayout"

[Florian Müllner <fmuellner src gnome org>]

commit 28e781cc61eade2a9dea2945e9b8c345be698b71
Author: Florian Müllner <fmuellner gnome org>
Date:   Sun Feb 15 19:45:18 2015 +0100

    Revert "calendar: Use Clutter.GridLayout"
    
    GridLayout has some weird allocation issues, TableLayout - deprecated
    or not - works, so just keep using that for now.
    
    This reverts commit e9f95ca605c225b97963b7a0d5df3dfc6b4702da.

 js/ui/calendar.js |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index de490a1..8320e52 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -402,7 +402,7 @@ const Calendar = new Lang.Class({
         this._shouldDateGrabFocus = false;
 
         this.actor = new St.Widget({ style_class: 'calendar',
-                                     layout_manager: new Clutter.GridLayout(),
+                                     layout_manager: new Clutter.TableLayout(),
                                      reactive: true });
 
         this.actor.connect('scroll-event',
@@ -440,7 +440,8 @@ const Calendar = new Lang.Class({
 
         // Top line of the calendar '<| September 2009 |>'
         this._topBox = new St.BoxLayout();
-        layout.attach(this._topBox, 0, 0, offsetCols + 7, 1);
+        layout.pack(this._topBox, 0, 0);
+        layout.set_span(this._topBox, offsetCols + 7, 1);
 
         this._backButton = new St.Button({ style_class: 'calendar-change-month-back',
                                            accessible_name: _("Previous month"),
@@ -477,7 +478,7 @@ const Calendar = new Lang.Class({
                 col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
             else
                 col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
-            layout.attach(label, col, 1, 1, 1);
+            layout.pack(label, col, 1);
             iter.setTime(iter.getTime() + MSECS_IN_DAY);
         }
 
@@ -650,14 +651,14 @@ const Calendar = new Lang.Class({
                 col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
             else
                 col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
-            layout.attach(button, col, row, 1, 1);
+            layout.pack(button, col, row);
 
             this._buttons.push(button);
 
             if (this._useWeekdate && iter.getDay() == 4) {
                 let label = new St.Label({ text: iter.toLocaleFormat('%V'),
                                            style_class: 'calendar-day-base calendar-week-number'});
-                layout.attach(label, rtl ? 7 : 0, row, 1, 1);
+                layout.pack(label, rtl ? 7 : 0, row);
             }
 
             iter.setTime(iter.getTime() + MSECS_IN_DAY);