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

popupMenu: block input events when menu is closing

Browse Source 
At the moment gnome-shell can get really confused if a menu is
fading out and gets clicked.

It can lead to mouse pointer input getting stuck until the shell
is restarted.

This commit addresses the problem by ignoring input events that
come in when the menu is closing.
This commit is contained in:
Ray Strode 2018-12-10 15:25:35 -05:00
parent 616852cf2b
commit a80e16d09e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/popupMenu.js
View File

@ -123,12 +123,18 @@ var PopupBaseMenuItem = new Lang.Class({
}, },
_onButtonReleaseEvent(actor, event) { _onButtonReleaseEvent(actor, event) {
if (this._parent && !this._parent.isOpen)
return Clutter.EVENT_STOP;
this.actor.remove_style_pseudo_class ('active'); this.actor.remove_style_pseudo_class ('active');
this.activate(event); this.activate(event);
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
}, },
_onTouchEvent(actor, event) { _onTouchEvent(actor, event) {
if (this._parent && !this._parent.isOpen)
return Clutter.EVENT_STOP;
if (event.type() == Clutter.EventType.TOUCH_END) { if (event.type() == Clutter.EventType.TOUCH_END) {
this.actor.remove_style_pseudo_class ('active'); this.actor.remove_style_pseudo_class ('active');
this.activate(event); this.activate(event);
@ -141,6 +147,9 @@ var PopupBaseMenuItem = new Lang.Class({
}, },
_onKeyPressEvent(actor, event) { _onKeyPressEvent(actor, event) {
if (this._parent && !this._parent.isOpen)
return Clutter.EVENT_STOP;
let state = event.get_state(); let state = event.get_state();
// if user has a modifier down (except capslock and numlock) // if user has a modifier down (except capslock and numlock)