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

appDisplay: Close popup when dragging

Browse Source 
When a drag starts inside a folder, and the cursor moves to
outside it, close the currently opened folder popup.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/603
This commit is contained in:
Georges Basile Stavracas Neto 2019-07-04 16:03:20 -03:00
parent 717ec0f8a4
commit 87a76a5757
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/ui/appDisplay.js
View File

@ -431,6 +431,7 @@ var AllView = class AllView extends BaseAppView {
Main.overview.connect('item-drag-end', this._onDragEnd.bind(this)); Main.overview.connect('item-drag-end', this._onDragEnd.bind(this));
this._nEventBlockerInhibits = 0; this._nEventBlockerInhibits = 0;
this._popdownId = 0;
} }
_refilterApps() { _refilterApps() {
@ -864,6 +865,25 @@ var AllView = class AllView extends BaseAppView {
} }
} }
_schedulePopdown() {
if (this._popdownId > 0)
return;
this._popdownId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 1000, () => {
if (this._currentPopup)
this._currentPopup.popdown();
this._popdownId = 0;
return GLib.SOURCE_REMOVE;
});
}
_unschedulePopdown() {
if (this._popdownId > 0) {
GLib.source_remove(this._popdownId);
this._popdownId = 0;
}
}
_onDragBegin() { _onDragBegin() {
this._dragMonitor = { this._dragMonitor = {
dragMotion: this._onDragMotion.bind(this) dragMotion: this._onDragMotion.bind(this)
@ -874,11 +894,22 @@ var AllView = class AllView extends BaseAppView {
_onDragMotion(dragEvent) { _onDragMotion(dragEvent) {
let appIcon = dragEvent.source; let appIcon = dragEvent.source;
// When dragging from a folder, don't nudge items; instead,
// prevent DND entirely by returning NO_DROP
if (this._currentPopup) {
if (dragEvent.targetActor == this._grid ||
this._grid.contains(dragEvent.targetActor)) {
this._schedulePopdown();
return DND.DragMotionResult.NO_DROP;
} else {
this._unschedulePopdown();
}
} else {
// Handle the drag overshoot. When dragging to above the // Handle the drag overshoot. When dragging to above the
// icon grid, move to the page above; when dragging below, // icon grid, move to the page above; when dragging below,
// move to the page below. // move to the page below.
if (appIcon.view == this)
this._handleDragOvershoot(dragEvent); this._handleDragOvershoot(dragEvent);
}
if (dragEvent.targetActor != this._grid) if (dragEvent.targetActor != this._grid)
this.removeNudges(); this.removeNudges();