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

messageTray: Use a PopupMenuManager for the message tray context menu

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=699272
This commit is contained in:
Jasper St. Pierre 2013-04-19 11:46:06 -04:00
parent e6ef11575b
commit f5c0706c2e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/messageTray.js
View File

@ -1766,6 +1766,8 @@ const MessageTray = new Lang.Class({
this._updateNoMessagesLabel();
this._contextMenu = new MessageTrayContextMenu(this);
this._contextMenuManager = new PopupMenu.PopupMenuManager({ actor: this.actor });
this._contextMenuManager.addMenu(this._contextMenu);
let clickAction = new Clutter.ClickAction();
this.actor.add_action(clickAction);
@ -1774,8 +1776,6 @@ const MessageTray = new Lang.Class({
let button = action.get_button();
if (button == 3)
this._openContextMenu();
if (button == 1 && this._contextMenu.isOpen)
this._grabHelper.ungrab({ actor: this._contextMenu.actor });
}));
clickAction.connect('long-press', Lang.bind(this, function(action, actor, state) {
@ -1792,11 +1792,6 @@ const MessageTray = new Lang.Class({
_openContextMenu: function () {
let [x, y, mask] = global.get_pointer();
this._contextMenu.setPosition(Math.round(x), Math.round(y));
this._grabHelper.grab({ actor: this._contextMenu.actor,
onUngrab: Lang.bind(this, function () {
this._contextMenu.close(BoxPointer.PopupAnimation.FULL);
})
});
this._contextMenu.open(BoxPointer.PopupAnimation.FULL);
},