diff options
author | Florian Müllner <fmuellner@gnome.org> | 2013-07-06 14:37:22 +0200 |
---|---|---|
committer | Florian Müllner <fmuellner@gnome.org> | 2014-05-28 22:11:38 +0200 |
commit | ec714864f2041ff1d128f4a3c3e457275264ebe4 (patch) | |
tree | 09810dc7dcfc8a46bb4f0be519f992553a3339ad | |
parent | 1b77149ec9a8ab6df6bb67433ec89d187203d3d7 (diff) |
calendar: Port calendar to ClutterTableLayout
We don't make use of any functionality StTable provides over
ClutterTableLayout, so port all users to the Clutter layout
in order to remove our own copy of the code.
https://bugzilla.gnome.org/show_bug.cgi?id=703833
-rw-r--r-- | data/theme/gnome-shell.css | 2 | ||||
-rw-r--r-- | js/ui/calendar.js | 25 |
2 files changed, 12 insertions, 15 deletions
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css index 64f2d8f4..9d08ec65 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css @@ -1300,8 +1300,6 @@ StScrollBar StButton#vhandle:active { .calendar { padding: .4em 1.75em .8em 1.75em; - spacing-rows: 0px; - spacing-columns: 0px; } .calendar-month-label { diff --git a/js/ui/calendar.js b/js/ui/calendar.js index 87bafb4d..3d709a6c 100644 --- a/js/ui/calendar.js +++ b/js/ui/calendar.js @@ -408,9 +408,9 @@ const Calendar = new Lang.Class({ this._shouldDateGrabFocus = false; - this.actor = new St.Table({ homogeneous: false, - style_class: 'calendar', - reactive: true }); + this.actor = new St.Widget({ style_class: 'calendar', + layout_manager: new Clutter.TableLayout(), + reactive: true }); this.actor.connect('scroll-event', Lang.bind(this, this._onScroll)); @@ -441,13 +441,14 @@ const Calendar = new Lang.Class({ }, _buildHeader: function() { + let layout = this.actor.layout_manager; let offsetCols = this._useWeekdate ? 1 : 0; this.actor.destroy_all_children(); // Top line of the calendar '<| September 2009 |>' this._topBox = new St.BoxLayout(); - this.actor.add(this._topBox, - { row: 0, col: 0, col_span: offsetCols + 7 }); + 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"), @@ -479,10 +480,8 @@ const Calendar = new Lang.Class({ let customDayAbbrev = _getCalendarDayAbbreviation(iter.getDay()); let label = new St.Label({ style_class: 'calendar-day-base calendar-day-heading', text: customDayAbbrev }); - this.actor.add(label, - { row: 1, - col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7, - x_fill: false, x_align: St.Align.MIDDLE }); + let col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7; + layout.pack(label, col, 1); iter.setTime(iter.getTime() + MSECS_IN_DAY); } @@ -601,6 +600,7 @@ const Calendar = new Lang.Class({ beginDate.setTime(beginDate.getTime() - (weekPadding + daysToWeekStart) * MSECS_IN_DAY); + let layout = this.actor.layout_manager; let iter = new Date(beginDate); let row = 2; // nRows here means 6 weeks + one header + one navbar @@ -648,16 +648,15 @@ const Calendar = new Lang.Class({ button.style_class = styleClass; let offsetCols = this._useWeekdate ? 1 : 0; - this.actor.add(button, - { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7 }); + let col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7; + layout.pack(button, col, row); this._buttons.push(button); if (this._useWeekdate && iter.getDay() == 4) { let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(), style_class: 'calendar-day-base calendar-week-number'}); - this.actor.add(label, - { row: row, col: 0, y_align: St.Align.MIDDLE }); + layout.pack(label, 0, row); } iter.setTime(iter.getTime() + MSECS_IN_DAY); |