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

Rewrite the layout code of the message tray

Browse Source 
Previous code had a mixture of fixed positioning and ClutterBinLayout,
and this was broken badly for autorun notifications.
Rewrite to use ClutterBinLayout and Clutter properties exclusively.

https://bugzilla.gnome.org/show_bug.cgi?id=683378
This commit is contained in:
Giovanni Campagna 2012-09-05 02:26:09 +02:00
parent 2890fc9d7d
commit 5c990f103e
2 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/ui/layout.js
View File

@ -120,7 +120,8 @@ const LayoutManager = new Lang.Class({
this.panelBox.connect('allocation-changed', this.panelBox.connect('allocation-changed',
Lang.bind(this, this._updatePanelBarriers)); Lang.bind(this, this._updatePanelBarriers));
this.trayBox = new St.BoxLayout({ name: 'trayBox' }); this.trayBox = new St.Widget({ name: 'trayBox',
layout_manager: new Clutter.BinLayout() });
this.addChrome(this.trayBox); this.addChrome(this.trayBox);
this.trayBox.connect('allocation-changed', this.trayBox.connect('allocation-changed',
Lang.bind(this, this._updateTrayBarrier)); Lang.bind(this, this._updateTrayBarrier));

52
js/ui/messageTray.js
View File

@ -1368,39 +1368,45 @@ const MessageTray = new Lang.Class({
})); }));
this.actor = new St.Widget({ name: 'message-tray', this.actor = new St.Widget({ name: 'message-tray',
layout_manager: new Clutter.BinLayout(),
reactive: true, reactive: true,
track_hover: true }); track_hover: true,
this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged)); layout_manager: new Clutter.BinLayout(),
x_expand: true,
y_expand: true,
y_align: Clutter.ActorAlign.START,
});
this.actor.connect('notify::hover', Lang.bind(this, this._onTrayHoverChanged)); this.actor.connect('notify::hover', Lang.bind(this, this._onTrayHoverChanged));
this._notificationWidget = new St.Widget({ name: 'notification-container', this._notificationWidget = new St.Widget({ name: 'notification-container',
x_align: Clutter.ActorAlign.CENTER,
x_expand: true,
layout_manager: new Clutter.BinLayout() }); layout_manager: new Clutter.BinLayout() });
this.actor.add_actor(this._notificationWidget); this.actor.add_actor(this._notificationWidget);
this._notificationBin = new St.Bin(); this._notificationBin = new St.Bin({ y_expand: true });
this._notificationBin.set_y_align(Clutter.ActorAlign.START);
this._notificationWidget.add_actor(this._notificationBin); this._notificationWidget.add_actor(this._notificationBin);
this._notificationWidget.hide(); this._notificationWidget.hide();
this._notificationQueue = []; this._notificationQueue = [];
this._notification = null; this._notification = null;
this._notificationClickedId = 0; this._notificationClickedId = 0;
this._summaryBin = new St.Bin({ x_align: St.Align.END, this.actor.connect('button-release-event', Lang.bind(this, function(actor, event) {
y_expand: true, // this is the Clutter property
reactive: true });
this._summaryBin.connect('button-release-event', Lang.bind(this, function(actor, event) {
this._setClickedSummaryItem(null); this._setClickedSummaryItem(null);
this._updateState(); this._updateState();
actor.grab_key_focus(); actor.grab_key_focus();
})); }));
this.actor.add_actor(this._summaryBin);
this._summary = new St.BoxLayout({ name: 'summary-mode', this._summary = new St.BoxLayout({ name: 'summary-mode',
reactive: true, reactive: true,
track_hover: true }); track_hover: true,
x_align: Clutter.ActorAlign.END,
x_expand: true,
y_align: Clutter.ActorAlign.CENTER,
y_expand: true });
global.focus_manager.add_group(this._summary); global.focus_manager.add_group(this._summary);
this._summary.connect('notify::hover', Lang.bind(this, this._onSummaryHoverChanged)); this._summary.connect('notify::hover', Lang.bind(this, this._onSummaryHoverChanged));
this._summaryBin.child = this._summary; this.actor.add_actor(this._summary);
this._summaryBin.opacity = 0; this._summary.opacity = 0;
this._summaryMotionId = 0; this._summaryMotionId = 0;
this._trayMotionId = 0; this._trayMotionId = 0;
@ -1469,9 +1475,6 @@ const MessageTray = new Lang.Class({
Main.layoutManager.trackChrome(this._notificationWidget); Main.layoutManager.trackChrome(this._notificationWidget);
Main.layoutManager.trackChrome(this._closeButton); Main.layoutManager.trackChrome(this._closeButton);
Main.layoutManager.connect('monitors-changed', Lang.bind(this, function() {
this.actor.style_changed();
}));
Main.layoutManager.connect('primary-fullscreen-changed', Lang.bind(this, this._onFullscreenChanged)); Main.layoutManager.connect('primary-fullscreen-changed', Lang.bind(this, this._onFullscreenChanged));
Main.overview.connect('showing', Lang.bind(this, Main.overview.connect('showing', Lang.bind(this,
@ -1550,15 +1553,6 @@ const MessageTray = new Lang.Class({
} }
}, },
_onStyleChanged: function() {
let monitor = Main.layoutManager.bottomMonitor;
let width = this._notificationWidget.get_width();
this._notificationWidget.x = Math.floor((monitor.width - width) / 2);
this._summaryBin.x = 0;
this._summaryBin.width = monitor.width;
},
contains: function(source) { contains: function(source) {
return this._getIndexOfSummaryItemForSource(source) >= 0; return this._getIndexOfSummaryItemForSource(source) >= 0;
}, },
@ -2311,18 +2305,16 @@ const MessageTray = new Lang.Class({
}, },
_showSummary: function() { _showSummary: function() {
this._summaryBin.opacity = 0; this._summary.opacity = 0;
this._summaryBin.y = this.actor.height; this._tween(this._summary, '_summaryState', State.SHOWN,
this._tween(this._summaryBin, '_summaryState', State.SHOWN, { opacity: 255,
{ y: 0,
opacity: 255,
time: ANIMATION_TIME, time: ANIMATION_TIME,
transition: 'easeOutQuad', transition: 'easeOutQuad',
}); });
}, },
_hideSummary: function() { _hideSummary: function() {
this._tween(this._summaryBin, '_summaryState', State.HIDDEN, this._tween(this._summary, '_summaryState', State.HIDDEN,
{ opacity: 0, { opacity: 0,
time: ANIMATION_TIME, time: ANIMATION_TIME,
transition: 'easeOutQuad', transition: 'easeOutQuad',