isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calendar: Use Clutter.GridLayout

Browse Source 
Clutter.TableLayout has been deprecated, so move to the recommended
replacement.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/808
This commit is contained in:
Florian Müllner 2014-06-20 16:23:32 +02:00
parent d5eafbad87
commit 0749ac27ce
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/calendar.js
View File

@ -348,7 +348,7 @@ var Calendar = GObject.registerClass({
super._init({ super._init({
style_class: 'calendar', style_class: 'calendar',
layout_manager: new Clutter.TableLayout(), layout_manager: new Clutter.GridLayout(),
reactive: true reactive: true
}); });
@ -394,8 +394,7 @@ var Calendar = GObject.registerClass({
// Top line of the calendar '<| September 2009 |>' // Top line of the calendar '<| September 2009 |>'
this._topBox = new St.BoxLayout(); this._topBox = new St.BoxLayout();
layout.pack(this._topBox, 0, 0); layout.attach(this._topBox, 0, 0, offsetCols + 7, 1);
layout.set_span(this._topBox, offsetCols + 7, 1);
this._backButton = new St.Button({ style_class: 'calendar-change-month-back pager-button', this._backButton = new St.Button({ style_class: 'calendar-change-month-back pager-button',
accessible_name: _("Previous month"), accessible_name: _("Previous month"),
@ -440,7 +439,7 @@ var Calendar = GObject.registerClass({
col = 6 - (7 + iter.getDay() - this._weekStart) % 7; col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
else else
col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7; col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
layout.pack(label, col, 1); layout.attach(label, col, 1, 1, 1);
iter.setTime(iter.getTime() + MSECS_IN_DAY); iter.setTime(iter.getTime() + MSECS_IN_DAY);
} }
@ -611,7 +610,7 @@ var Calendar = GObject.registerClass({
col = 6 - (7 + iter.getDay() - this._weekStart) % 7; col = 6 - (7 + iter.getDay() - this._weekStart) % 7;
else else
col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7; col = offsetCols + (7 + iter.getDay() - this._weekStart) % 7;
layout.pack(button, col, row); layout.attach(button, col, row, 1, 1);
this._buttons.push(button); this._buttons.push(button);
@ -621,7 +620,7 @@ var Calendar = GObject.registerClass({
can_focus: true }); can_focus: true });
let weekFormat = Shell.util_translate_time_string(N_("Week %V")); let weekFormat = Shell.util_translate_time_string(N_("Week %V"));
label.accessible_name = iter.toLocaleFormat(weekFormat); label.accessible_name = iter.toLocaleFormat(weekFormat);
layout.pack(label, rtl ? 7 : 0, row); layout.attach(label, rtl ? 7 : 0, row, 1, 1);
} }
iter.setTime(iter.getTime() + MSECS_IN_DAY); iter.setTime(iter.getTime() + MSECS_IN_DAY);