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

appDisplay: Only change excluded-apps when not deleting folder

Browse Source 
It is useless to update the 'excluded-apps' list when we know we're going
to delete the folder entirely.

Only update 'excluded-apps' when not deleting the app folder.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1447
This commit is contained in:
Georges Basile Stavracas Neto 2020-09-24 12:41:27 -03:00 committed by Florian Müllner
parent 75a8697671
commit 31591ff029
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/appDisplay.js
View File

@ -1806,15 +1806,6 @@ class FolderView extends BaseAppView {
if (index >= 0) if (index >= 0)
folderApps.splice(index, 1); folderApps.splice(index, 1);
// If this is a categories-based folder, also add it to
// the list of excluded apps
let categories = this._folder.get_strv('categories');
if (categories.length > 0) {
let excludedApps = this._folder.get_strv('excluded-apps');
excludedApps.push(app.id);
this._folder.set_strv('excluded-apps', excludedApps);
}
// Remove the folder if this is the last app icon; otherwise, // Remove the folder if this is the last app icon; otherwise,
// just remove the icon // just remove the icon
if (folderApps.length == 0) { if (folderApps.length == 0) {
@ -1828,6 +1819,15 @@ class FolderView extends BaseAppView {
folders.splice(folders.indexOf(this._id), 1); folders.splice(folders.indexOf(this._id), 1);
settings.set_strv('folder-children', folders); settings.set_strv('folder-children', folders);
} else { } else {
// If this is a categories-based folder, also add it to
// the list of excluded apps
const categories = this._folder.get_strv('categories');
if (categories.length > 0) {
const excludedApps = this._folder.get_strv('excluded-apps');
excludedApps.push(app.id);
this._folder.set_strv('excluded-apps', excludedApps);
}
this._folder.set_strv('apps', folderApps); this._folder.set_strv('apps', folderApps);
} }
} }