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

allView, folderView: Implement moving icons

Browse Source 
This makes use of the new BaseAppIcon.moveItem() API.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/603
This commit is contained in:
Georges Basile Stavracas Neto 2019-07-02 17:42:29 -03:00
parent 4056c56800
commit 6e3696baad
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
1 changed files with 97 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
js/ui/appDisplay.js
View File

@ -515,6 +515,37 @@ var AllView = class AllView extends BaseAppView {
return newApps;
}
moveItem(item, position) {
let visibleApps = this._allItems.filter(icon => icon.actor.visible);
let oldPosition = visibleApps.indexOf(item);
if (oldPosition == position)
return;
super.moveItem(item, position);
if (position > oldPosition)
position -= 1;
// Update all custom icon positions to match what's visible
visibleApps = this._allItems.filter(icon => icon.actor.visible);
let iconsData = this._gridSettings.get_value('icons-data').deep_unpack();
visibleApps.forEach((icon, index) => {
if (!iconsData[icon.id] || icon.id == item.id)
return;
iconsData[icon.id] = new GLib.Variant('a{sv}', {
'position': GLib.Variant.new_uint32(index),
});
});
iconsData[item.id] = new GLib.Variant('a{sv}', {
'position': GLib.Variant.new_uint32(position),
});
this._gridSettings.set_value('icons-data',
new GLib.Variant('a{sv}', iconsData));
}
_loadGrid() {
super._loadGrid();
this._refilterApps();
@ -811,45 +842,60 @@ var AllView = class AllView extends BaseAppView {
if (appIcon.view == this)
this._handleDragOvershoot(dragEvent);
if (dragEvent.targetActor != this._grid)
this.removeNudges();
return DND.DragMotionResult.CONTINUE;
}
_onDragEnd() {
this.removeNudges();
if (this._dragMonitor) {
DND.removeDragMonitor(this._dragMonitor);
this._dragMonitor = null;
}
}
_canDropAt(source) {
if (!(source instanceof AppIcon))
return false;
if (!global.settings.is_writable('favorite-apps'))
return false;
if (!(source.view instanceof FolderView))
return false;
return true;
handleDragOver(source, actor, x, y, time) {
let sourceIndex = -1;
if (source.view == this) {
let visibleItems = this._allItems.filter(item => item.actor.visible);
sourceIndex = visibleItems.indexOf(source);
}
handleDragOver(source, actor, x, y, time) {
if (!this._canDropAt(source))
return DND.DragMotionResult.NO_DROP;
let [index, dragLocation] = this.canDropAt(x, y);
this.removeNudges();
if (source.view && source.view != this)
source.view.removeNudges();
if (index != -1) {
if (sourceIndex == -1 || (index != sourceIndex && index != sourceIndex + 1))
this.nudgeItemsAtIndex(index, dragLocation);
return DND.DragMotionResult.MOVE_DROP;
}
return DND.DragMotionResult.NO_DROP;
}
acceptDrop(source, actor, x, y, time) {
if (!this._canDropAt(source))
let [index, dragLocation] = this.canDropAt(x, y);
if (index == -1)
return false;
if (source.view instanceof FolderView) {
source.view.removeApp(source.app);
source = this._items[source.id];
if (this._currentPopup)
this._currentPopup.popdown();
}
this.moveItem(source, index);
this.removeNudges();
return true;
}
@ -1228,6 +1274,7 @@ var FolderView = class FolderView extends BaseAppView {
let scrollableContainer = new St.BoxLayout({ vertical: true, reactive: true });
scrollableContainer.add_actor(this._grid);
this.actor.add_actor(scrollableContainer);
this._grid._delegate = this;
let action = new Clutter.PanAction({ interpolate: true });
action.connect('pan', this._onPan.bind(this));
@ -1297,6 +1344,29 @@ var FolderView = class FolderView extends BaseAppView {
this.actor.set_height(this.usedHeight());
}
handleDragOver(source, actor, x, y, time) {
let [index, dragLocation] = this.canDropAt(x, y);
let sourceIndex = this._allItems.indexOf(source);
this._parentView.removeNudges();
this.removeNudges();
if (index != -1 && index != sourceIndex && index != sourceIndex + 1)
this.nudgeItemsAtIndex(index, dragLocation);
return DND.DragMotionResult.MOVE_DROP;
}
acceptDrop(source, actor, x, y, time) {
let [index, dragLocation] = this.canDropAt(x, y);
let success = index != -1;
if (success)
this.moveItem(source, index);
this.removeNudges();
return success;
}
_getPageAvailableSize() {
let pageBox = new Clutter.ActorBox();
pageBox.x1 = pageBox.y1 = 0;
@ -1378,6 +1448,13 @@ var FolderView = class FolderView extends BaseAppView {
return true;
}
moveItem(item, newPosition) {
super.moveItem(item, newPosition);
let appIds = this._allItems.map(icon => icon.id);
this._folder.set_strv('apps', appIds);
}
};
var FolderIcon = class FolderIcon {