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

appDisplay: Popdown folder dialog on DnD

Browse Source 
So that we're still able to drag icons out of folders, and to the
Dash. Wait 600ms (MENU_POPUP_TIMEOUT) before popping it down.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1301
This commit is contained in:
Georges Basile Stavracas Neto 2020-06-04 22:32:14 -03:00
parent 8ae99a6898
commit 30172b5625
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
js/ui/appDisplay.js
View File

@ -1395,7 +1395,8 @@ var FolderIcon = GObject.registerClass({
if (this._dialog) if (this._dialog)
return; return;
if (!this._dialog) { if (!this._dialog) {
this._dialog = new AppFolderDialog(this, this._folder); this._dialog = new AppFolderDialog(this, this._folder,
this._parentView);
this._parentView.addFolderDialog(this._dialog); this._parentView.addFolderDialog(this._dialog);
this._dialog.connect('open-state-changed', (popup, isOpen) => { this._dialog.connect('open-state-changed', (popup, isOpen) => {
if (!isOpen) if (!isOpen)
@ -1410,7 +1411,7 @@ var AppFolderDialog = GObject.registerClass({
'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] }, 'open-state-changed': { param_types: [GObject.TYPE_BOOLEAN] },
}, },
}, class AppFolderDialog extends St.Bin { }, class AppFolderDialog extends St.Bin {
_init(source, folder) { _init(source, folder, appDisplay) {
super._init({ super._init({
visible: false, visible: false,
x_expand: true, x_expand: true,
@ -1437,6 +1438,8 @@ var AppFolderDialog = GObject.registerClass({
this._source = source; this._source = source;
this._folder = folder; this._folder = folder;
this._view = source.view; this._view = source.view;
this._appDisplay = appDisplay;
this._delegate = this;
this._isOpen = false; this._isOpen = false;
this.parentOffset = 0; this.parentOffset = 0;
@ -1469,6 +1472,7 @@ var AppFolderDialog = GObject.registerClass({
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
this._sourceMappedId = 0; this._sourceMappedId = 0;
this._popdownTimeoutId = 0;
this._needsZoomAndFade = false; this._needsZoomAndFade = false;
} }
@ -1680,6 +1684,11 @@ var AppFolderDialog = GObject.registerClass({
this._source.disconnect(this._sourceMappedId); this._source.disconnect(this._sourceMappedId);
this._sourceMappedId = 0; this._sourceMappedId = 0;
} }
if (this._popdownTimeoutId > 0) {
GLib.source_remove(this._popdownTimeoutId);
this._popdownTimeoutId = 0;
}
} }
vfunc_allocate(box) { vfunc_allocate(box) {
@ -1736,6 +1745,34 @@ var AppFolderDialog = GObject.registerClass({
return this.navigate_focus(null, direction, false); return this.navigate_focus(null, direction, false);
} }
_withinDialog(x, y) {
const childAllocation =
Shell.util_get_transformed_allocation(this.child);
return x > childAllocation.x1 &&
x < childAllocation.x2 &&
y > childAllocation.y1 &&
y < childAllocation.y2;
}
handleDragOver(source, actor, x, y) {
if (this._withinDialog(x, y)) {
if (this._popdownTimeoutId > 0) {
GLib.source_remove(this._popdownTimeoutId);
this._popdownTimeoutId = 0;
}
} else if (this._popdownTimeoutId === 0) {
this._popdownTimeoutId =
GLib.timeout_add(GLib.PRIORITY_DEFAULT, MENU_POPUP_TIMEOUT, () => {
this._popdownTimeoutId = 0;
this.popdown();
return GLib.SOURCE_REMOVE;
});
}
return DND.DragMotionResult.NO_DROP;
}
toggle() { toggle() {
if (this._isOpen) if (this._isOpen)
this.popdown(); this.popdown();