[gnome-shell/gbsneto/icon-grid-dnd: 12/13] appIcon: End running drag operations on destroy
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gbsneto/icon-grid-dnd: 12/13] appIcon: End running drag operations on destroy
- Date: Sat, 29 Jun 2019 04:53:07 +0000 (UTC)
commit dc2766d44252d7476f7f6399231ffdbcaeb47edd
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat Jun 29 01:32:40 2019 -0300
appIcon: End running drag operations on destroy
AppIcon makes itself draggable, and handles the various DnD
routines such as 'drag-begin' and 'drag-end' by making the
Overview emit the appropriate signals.
However, when destroyed, the AppIcon does not try to finish
any drag operations that started. That causes the event
blocker in AllView not to be updated correctly when dragging
icons to outside folders.
Make AppIcon emit 'item-drag-end' when a drag operation
started and it's destroyed.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/603
js/ui/appDisplay.js | 7 +++++++
1 file changed, 7 insertions(+)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index af6a5f94a..e3a25dee7 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1666,13 +1666,16 @@ var AppIcon = class AppIcon {
if (isDraggable) {
this._draggable = DND.makeDraggable(this.actor);
this._draggable.connect('drag-begin', () => {
+ this._dragging = true;
this._removeMenuTimeout();
Main.overview.beginItemDrag(this);
});
this._draggable.connect('drag-cancelled', () => {
+ this._dragging = false;
Main.overview.cancelledItemDrag(this);
});
this._draggable.connect('drag-end', () => {
+ this._dragging = false;
Main.overview.endItemDrag(this);
});
}
@@ -1689,6 +1692,10 @@ var AppIcon = class AppIcon {
_onDestroy() {
if (this._stateChangedId > 0)
this.app.disconnect(this._stateChangedId);
+ if (this._draggable && this._dragging) {
+ Main.overview.endItemDrag(this);
+ this.draggable = null;
+ }
this._stateChangedId = 0;
this._removeMenuTimeout();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]