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

appDisplay: Append new icons at the first available page after first

Browse Source 
As per design discussion, the first page is a somewhat of a special
page where we really don't want to change anything unless necessary.

Append new icons at the first available slot after the first page.
Make the placeholder icon be appended to the first available page
as well, since it's always used when dragging from folder dialogs.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1284
This commit is contained in:
Georges Basile Stavracas Neto 2020-06-25 17:33:48 -03:00 committed by Florian Müllner
parent d93b51e135
commit bde974087a
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/ui/appDisplay.js
View File

@ -497,10 +497,27 @@ var BaseAppView = GObject.registerClass({
return true;
}
_findBestPageToAppend(startPage = 1) {
for (let i = startPage; i < this._grid.nPages; i++) {
const pageItems =
this._grid.getItemsAtPage(i).filter(c => c.visible);
if (pageItems.length < this._grid.itemsPerPage)
return i;
}
return -1;
}
_addItem(item, page, position) {
let itemIndex = 0;
if (this._grid.nPages > 0) {
// Append icons to the first page with empty slot, starting from
// the second page
if (this._grid.nPages > 1 && page === -1 && position === -1)
page = this._findBestPageToAppend();
const realPage = page === -1 ? this._grid.nPages - 1 : page;
itemIndex = position === -1
@ -1001,8 +1018,14 @@ class AppDisplay extends BaseAppView {
}
_getItemPosition(item) {
if (item === this._placeholder)
return this._grid.getItemPosition(item);
if (item === this._placeholder) {
let [page, position] = this._grid.getItemPosition(item);
if (page === -1)
page = this._findBestPageToAppend(this._grid.currentPage);
return [page, position];
}
return this._pageManager.getAppPosition(item.id);
}