[gnome-shell/gbsneto/icon-grid-dnd: 52/96] 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: 52/96] appIcon: End running drag operations on destroy
- Date: Tue, 16 Jul 2019 23:26:30 +0000 (UTC)
commit 6d4cc031b50be588f7e3773b2cbb667d105195c7
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 09f34af35..4b2300806 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1478,13 +1478,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);
});
}
@@ -1501,6 +1504,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]