AppDisplay: fake a release event to dnd when opening the menu

PopupMenuManager eats the next release event, which would otherwise close
the menu, so we need to tell dnd that we're handling it, and no drag should
be started, so it can ungrab the pointer and restore state.

https://bugzilla.gnome.org/show_bug.cgi?id=694276
This commit is contained in:
Giovanni Campagna 2013-02-20 16:55:02 +01:00
parent 37700b4b1a
commit a50ddd6d8c
2 changed files with 16 additions and 1 deletions

View File

@ -790,6 +790,7 @@ const AppIcon = new Lang.Class({
popupMenu: function() {
this._removeMenuTimeout();
this.actor.fake_release();
this._draggable.fakeRelease();
if (!this._menu) {
this._menu = new AppIconMenu(this);

View File

@ -136,9 +136,10 @@ const _Draggable = new Lang.Class({
},
_ungrabActor: function() {
Clutter.ungrab_pointer();
if (!this._onEventId)
return;
Clutter.ungrab_pointer();
this.actor.disconnect(this._onEventId);
this._onEventId = null;
},
@ -203,6 +204,19 @@ const _Draggable = new Lang.Class({
return false;
},
/**
* fakeRelease:
*
* Fake a release event.
* Must be called if you want to intercept release events on draggable
* actors for other purposes (for example if you're using
* PopupMenu.ignoreRelease())
*/
fakeRelease: function() {
this._buttonDown = false;
this._ungrabActor();
},
/**
* startDrag:
* @stageX: X coordinate of event