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

messageTray: A variable to indicate that the close button was clicked

Browse Source 
Otherwise critical resident notifications can not be closed by
clicking the close button.

https://bugzilla.gnome.org/show_bug.cgi?id=683472
This commit is contained in:
Debarshi Ray 2012-09-06 11:45:30 +02:00
parent 7f479e18e6
commit ec52928736
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/ui/messageTray.js
View File

@ -1451,6 +1451,7 @@ const MessageTray = new Lang.Class({
this._pointerInKeyboard = false; this._pointerInKeyboard = false;
this._summaryState = State.HIDDEN; this._summaryState = State.HIDDEN;
this._pointerInSummary = false; this._pointerInSummary = false;
this._notificationClosed = false;
this._notificationState = State.HIDDEN; this._notificationState = State.HIDDEN;
this._notificationTimeoutId = 0; this._notificationTimeoutId = 0;
this._notificationExpandedId = 0; this._notificationExpandedId = 0;
@ -1547,9 +1548,13 @@ const MessageTray = new Lang.Class({
_onCloseClicked: function() { _onCloseClicked: function() {
if (this._notificationState == State.SHOWN) { if (this._notificationState == State.SHOWN) {
this._notificationClosed = true;
this._notification.emit('done-displaying'); this._notification.emit('done-displaying');
if (!this._notification.resident) if (!this._notification.resident)
this._notification.destroy(); this._notification.destroy();
this._notificationClosed = false;
} }
}, },
@ -1913,7 +1918,7 @@ const MessageTray = new Lang.Class({
!(this._pointerInKeyboard && notificationExpanded); !(this._pointerInKeyboard && notificationExpanded);
let notificationLockedOut = this._isScreenLocked && (this._notification && !this._notification.showWhenLocked); let notificationLockedOut = this._isScreenLocked && (this._notification && !this._notification.showWhenLocked);
// TODO: how to deal with locked out notiifcations if want to keep showing notifications?! // TODO: how to deal with locked out notiifcations if want to keep showing notifications?!
let notificationMustClose = this._notificationRemoved || notificationLockedOut || (notificationExpired && this._userActiveWhileNotificationShown); let notificationMustClose = this._notificationRemoved || notificationLockedOut || (notificationExpired && this._userActiveWhileNotificationShown) || this._notificationClosed;
let canShowNotification = notificationsPending && this._summaryState == State.HIDDEN; let canShowNotification = notificationsPending && this._summaryState == State.HIDDEN;
if (this._notificationState == State.HIDDEN) { if (this._notificationState == State.HIDDEN) {