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

calendar: Port events to Clutter.GridLayout

Browse Source 
Clutter.TableLayout has been deprecated, so move to the recommended
replacement.
This commit is contained in:
Florian Müllner 2014-08-05 23:59:28 +02:00
parent e9f95ca605
commit b90cc5ff26
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/ui/calendar.js
View File

@ -706,7 +706,7 @@ const EventsList = new Lang.Class({
Name: 'EventsList', Name: 'EventsList',
_init: function() { _init: function() {
let layout = new Clutter.TableLayout(); let layout = new Clutter.GridLayout({ orientation: Clutter.Orientation.VERTICAL });
this.actor = new St.Widget({ style_class: 'events-table', this.actor = new St.Widget({ style_class: 'events-table',
layout_manager: layout }); layout_manager: layout });
layout.hookup_style(this.actor); layout.hookup_style(this.actor);
@ -729,36 +729,34 @@ const EventsList = new Lang.Class({
dayString = ''; dayString = '';
let dayLabel = new St.Label({ style_class: 'events-day-dayname', let dayLabel = new St.Label({ style_class: 'events-day-dayname',
text: dayString }); text: dayString,
x_align: Clutter.ActorAlign.END,
y_align: Clutter.ActorAlign.START });
dayLabel.clutter_text.line_wrap = false; dayLabel.clutter_text.line_wrap = false;
dayLabel.clutter_text.ellipsize = false; dayLabel.clutter_text.ellipsize = false;
let rtl = this.actor.get_text_direction() == Clutter.TextDirection.RTL; let rtl = this.actor.get_text_direction() == Clutter.TextDirection.RTL;
let layout = this.actor.layout_manager; let layout = this.actor.layout_manager;
layout.pack(dayLabel, rtl ? 2 : 0, index); layout.attach(dayLabel, rtl ? 2 : 0, index, 1, 1);
layout.child_set(dayLabel, { x_expand: false,
x_align: Clutter.TableAlignment.END,
y_align: Clutter.TableAlignment.START });
let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY); let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
let timeString = _formatEventTime(event, clockFormat); let timeString = _formatEventTime(event, clockFormat);
let timeLabel = new St.Label({ style_class: 'events-day-time', let timeLabel = new St.Label({ style_class: 'events-day-time',
text: timeString }); text: timeString,
y_align: Clutter.ActorAlign.START });
timeLabel.clutter_text.line_wrap = false; timeLabel.clutter_text.line_wrap = false;
timeLabel.clutter_text.ellipsize = false; timeLabel.clutter_text.ellipsize = false;
layout.pack(timeLabel, 1, index); layout.attach(timeLabel, 1, index, 1, 1);
layout.child_set(timeLabel, { x_expand: false,
y_align: Clutter.TableAlignment.START });
let titleLabel = new St.Label({ style_class: 'events-day-task', let titleLabel = new St.Label({ style_class: 'events-day-task',
text: event.summary }); text: event.summary,
x_expand: true });
titleLabel.clutter_text.line_wrap = true; titleLabel.clutter_text.line_wrap = true;
titleLabel.clutter_text.ellipsize = false; titleLabel.clutter_text.ellipsize = false;
layout.pack(titleLabel, rtl ? 0 : 2, index); layout.attach(titleLabel, rtl ? 0 : 2, index, 1, 1);
layout.child_set(titleLabel, { x_expand: true });
}, },
_addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) { _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
@ -769,8 +767,7 @@ const EventsList = new Lang.Class({
let label = new St.Label({ style_class: 'events-day-header', text: header }); let label = new St.Label({ style_class: 'events-day-header', text: header });
let layout = this.actor.layout_manager; let layout = this.actor.layout_manager;
layout.pack(label, 0, index); layout.attach(label, 0, index, 3, 1);
layout.child_set(label, { column_span: 3, x_expand: false });
index++; index++;
for (let n = 0; n < events.length; n++) { for (let n = 0; n < events.length; n++) {