From 71c23613b5e3d05a4c2bf3a0cf7d62e5268cb417 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 19 Sep 2012 00:37:24 -0300 Subject: [PATCH] messageTray: Only hide the notification stack on clicking close Rather than destroying the entire source, which is unintuitive, simply close the notification. Removing the entire source is still possible by right-clicking on the summary item and choosing "Remove". https://bugzilla.gnome.org/show_bug.cgi?id=682237 --- js/ui/messageTray.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js index a425926f4..9c9221f35 100644 --- a/js/ui/messageTray.js +++ b/js/ui/messageTray.js @@ -1247,10 +1247,6 @@ const SummaryItem = new Lang.Class({ this.notificationStackWidget.add_actor(this.notificationStackView); this.closeButton = makeCloseButton(); - this.closeButton.connect('clicked', Lang.bind(this, function() { - source.destroy(); - source.emit('done-displaying-content'); - })); this.notificationStackWidget.add_actor(this.closeButton); this._stackedNotifications = []; @@ -2414,6 +2410,7 @@ const MessageTray = new Lang.Class({ let closeButton = this._summaryBoxPointerItem.closeButton; closeButton.show(); + this._summaryBoxPointerCloseClickedId = closeButton.connect('clicked', Lang.bind(this, this._hideSummaryBoxPointer)); this._summaryBoxPointerItem.prepareNotificationStackForShowing(); } else if (this._clickedSummaryItemMouseButton == 3) { this._summaryBoxPointer.bin.child = this._clickedSummaryItem.rightClickMenu; @@ -2523,6 +2520,8 @@ const MessageTray = new Lang.Class({ this._summaryBoxPointer.bin.child = null; this._summaryBoxPointerItem.disconnect(this._summaryBoxPointerContentUpdatedId); this._summaryBoxPointerContentUpdatedId = 0; + this._summaryBoxPointerItem.closeButton.disconnect(this._summaryBoxPointerCloseClickedId); + this._summaryBoxPointerCloseClickedId = 0; this._summaryBoxPointerItem.source.disconnect(this._sourceDoneDisplayingId); this._summaryBoxPointerDoneDisplayingId = 0;