[gnome-shell] messageTray: Drop more special overview handling
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] messageTray: Drop more special overview handling
- Date: Mon, 18 Feb 2013 19:44:07 +0000 (UTC)
commit f3901eb6681ca0202309089ffea3e2b864fdd3a4
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sun Feb 17 13:38:10 2013 -0500
messageTray: Drop more special overview handling
https://bugzilla.gnome.org/show_bug.cgi?id=694038
js/ui/messageTray.js | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index ce72136..9425564 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1671,7 +1671,6 @@ const MessageTray = new Lang.Class({
this._summaryBoxPointerState = State.HIDDEN;
this._summaryBoxPointerTimeoutId = 0;
this._desktopCloneState = State.HIDDEN;
- this._overviewVisible = Main.overview.visible;
this._notificationRemoved = false;
this._reNotifyAfterHideNotification = null;
this._inFullscreen = false;
@@ -1693,17 +1692,10 @@ const MessageTray = new Lang.Class({
Main.layoutManager.connect('primary-fullscreen-changed', Lang.bind(this, this._onFullscreenChanged));
- Main.overview.connect('showing', Lang.bind(this,
- function() {
- this._overviewVisible = true;
- this._grabHelper.ungrab(); // drop modal grab if necessary
- this._updateState();
- }));
- Main.overview.connect('hiding', Lang.bind(this,
- function() {
- this._overviewVisible = false;
- this._updateState();
- }));
+ // If the overview shows or hides while we're in
+ // the message tray, revert back to normal mode.
+ Main.overview.connect('showing', Lang.bind(this, this._escapeTray));
+ Main.overview.connect('hiding', Lang.bind(this, this._escapeTray));
// Track if we've added the activities button
this._activitiesButtonAdded = false;
@@ -2402,7 +2394,7 @@ const MessageTray = new Lang.Class({
if (this._desktopClone)
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,
clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
Main.uiGroup.insert_child_above(this._desktopClone, cloneSource);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]