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

messageTray: Don't show the context-menu when the tray isn't open

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=697709
This commit is contained in:
Jasper St. Pierre 2013-03-18 13:49:53 -04:00
parent 8a3c8d1b1c
commit 1bce210c51
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/messageTray.js
View File

@ -1721,6 +1721,9 @@ const MessageTray = new Lang.Class({
this.actor.add_action(clickAction); this.actor.add_action(clickAction);
clickAction.connect('clicked', Lang.bind(this, function(action) { clickAction.connect('clicked', Lang.bind(this, function(action) {
if (this._trayState != State.SHOWN)
return;
let button = action.get_button(); let button = action.get_button();
if (button == 3) if (button == 3)
this._openContextMenu(); this._openContextMenu();
@ -1731,7 +1734,7 @@ const MessageTray = new Lang.Class({
clickAction.connect('long-press', Lang.bind(this, function(action, actor, state) { clickAction.connect('long-press', Lang.bind(this, function(action, actor, state) {
switch (state) { switch (state) {
case Clutter.LongPressState.QUERY: case Clutter.LongPressState.QUERY:
return true; return this._trayState == State.SHOWN;
case Clutter.LongPressState.ACTIVATE: case Clutter.LongPressState.ACTIVATE:
this._openContextMenu(); this._openContextMenu();
} }