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

messageTray: Drop more special overview handling

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=694038
This commit is contained in:
Jasper St. Pierre 2013-02-17 13:38:10 -05:00
parent b53d1df4df
commit f3901eb668
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/messageTray.js
View File

@ -1671,7 +1671,6 @@ const MessageTray = new Lang.Class({
this._summaryBoxPointerState = State.HIDDEN; this._summaryBoxPointerState = State.HIDDEN;
this._summaryBoxPointerTimeoutId = 0; this._summaryBoxPointerTimeoutId = 0;
this._desktopCloneState = State.HIDDEN; this._desktopCloneState = State.HIDDEN;
this._overviewVisible = Main.overview.visible;
this._notificationRemoved = false; this._notificationRemoved = false;
this._reNotifyAfterHideNotification = null; this._reNotifyAfterHideNotification = null;
this._inFullscreen = false; this._inFullscreen = false;
@ -1693,17 +1692,10 @@ const MessageTray = new Lang.Class({
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, // If the overview shows or hides while we're in
function() { // the message tray, revert back to normal mode.
this._overviewVisible = true; Main.overview.connect('showing', Lang.bind(this, this._escapeTray));
this._grabHelper.ungrab(); // drop modal grab if necessary Main.overview.connect('hiding', Lang.bind(this, this._escapeTray));
this._updateState();
}));
Main.overview.connect('hiding', Lang.bind(this,
function() {
this._overviewVisible = false;
this._updateState();
}));
// Track if we've added the activities button // Track if we've added the activities button
this._activitiesButtonAdded = false; this._activitiesButtonAdded = false;
@ -2402,7 +2394,7 @@ const MessageTray = new Lang.Class({
if (this._desktopClone) if (this._desktopClone)
this._desktopClone.destroy(); this._desktopClone.destroy();
let cloneSource = this._overviewVisible ? global.overlay_group : global.window_group; let cloneSource = Main.overview.visible ? global.overlay_group : global.window_group;
this._desktopClone = new Clutter.Clone({ source: cloneSource, this._desktopClone = new Clutter.Clone({ source: cloneSource,
clip: new Clutter.Geometry(this._bottomMonitorGeometry) }); clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
Main.uiGroup.insert_child_above(this._desktopClone, cloneSource); Main.uiGroup.insert_child_above(this._desktopClone, cloneSource);