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

appDisplay: Actually destroy icons

Browse Source 
AppDisplay currently adds all icons, and hides the ones inside
a folder. Change that to only add the icons that are not inside
folders. Adding an icon to a folder removes the icon from the
main grid.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1271
This commit is contained in:
Georges Basile Stavracas Neto 2020-05-19 17:49:09 -03:00
parent fb4a4ca4a2
commit 75c4e1cd63
1 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
js/ui/appDisplay.js
View File

@ -435,7 +435,6 @@ class AppDisplay extends BaseAppView {
}); });
super._redisplay(); super._redisplay();
this._refilterApps();
} }
_itemNameChanged(item) { _itemNameChanged(item) {
@ -450,39 +449,6 @@ class AppDisplay extends BaseAppView {
this.selectApp(item.id); this.selectApp(item.id);
} }
_isItemInFolder(itemId) {
for (const folder of this._folderIcons) {
const folderApps = folder.getAppIds();
if (folderApps.some(appId => appId === itemId))
return true;
}
return false;
}
_refilterApps() {
let filteredApps = this._orderedItems.filter(icon => !icon.visible);
this._orderedItems.forEach(icon => {
if (icon instanceof AppIcon)
icon.visible = true;
});
this._folderIcons.forEach(folder => {
let folderApps = folder.getAppIds();
folderApps.forEach(appId => {
let appIcon = this._items.get(appId);
appIcon.visible = false;
});
});
// Scale in app icons that weren't visible, but now are
filteredApps.filter(icon => icon.visible).forEach(icon => {
if (icon instanceof AppIcon)
icon.scaleIn();
});
}
getAppInfos() { getAppInfos() {
return this._appInfoList; return this._appInfoList;
} }
@ -502,6 +468,7 @@ class AppDisplay extends BaseAppView {
let appSys = Shell.AppSystem.get_default(); let appSys = Shell.AppSystem.get_default();
const appsInsideFolders = new Set();
this._folderIcons = []; this._folderIcons = [];
let folders = this._folderSettings.get_strv('folder-children'); let folders = this._folderSettings.get_strv('folder-children');
@ -513,8 +480,17 @@ class AppDisplay extends BaseAppView {
icon.connect('name-changed', this._itemNameChanged.bind(this)); icon.connect('name-changed', this._itemNameChanged.bind(this));
icon.connect('apps-changed', this._redisplay.bind(this)); icon.connect('apps-changed', this._redisplay.bind(this));
} }
// Don't try to display empty folders
if (!icon.visible) {
icon.destroy();
return;
}
appIcons.push(icon); appIcons.push(icon);
this._folderIcons.push(icon); this._folderIcons.push(icon);
icon.getAppIds().forEach(appId => appsInsideFolders.add(appId));
}); });
// Allow dragging of the icon only if the Dash would accept a drop to // Allow dragging of the icon only if the Dash would accept a drop to
@ -526,6 +502,9 @@ class AppDisplay extends BaseAppView {
let favoritesWritable = global.settings.is_writable('favorite-apps'); let favoritesWritable = global.settings.is_writable('favorite-apps');
apps.forEach(appId => { apps.forEach(appId => {
if (appsInsideFolders.has(appId))
return;
let icon = this._items.get(appId); let icon = this._items.get(appId);
if (!icon) { if (!icon) {
let app = appSys.lookup_app(appId); let app = appSys.lookup_app(appId);
@ -535,7 +514,6 @@ class AppDisplay extends BaseAppView {
}); });
} }
icon.visible = !this._isItemInFolder(appId);
appIcons.push(icon); appIcons.push(icon);
}); });