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

appDisplay: Cache app ids in FolderView

Browse Source 
Instead of reading a GSettings and building the app ids list
every single time FolderView needs to check for something,
cache it before redisplay and reuse this cached list everywhere.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1409
This commit is contained in:
Georges Basile Stavracas Neto 2020-08-13 20:20:52 -03:00 committed by Florian Müllner
parent 990c171bed
commit 7fcaf63291
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/appDisplay.js
View File

@ -1604,6 +1604,7 @@ class FolderView extends BaseAppView {
action.connect('pan', this._onPan.bind(this)); action.connect('pan', this._onPan.bind(this));
this._scrollView.add_action(action); this._scrollView.add_action(action);
this._appIds = [];
this._redisplay(); this._redisplay();
} }
@ -1649,8 +1650,7 @@ class FolderView extends BaseAppView {
} }
_getItemPosition(item) { _getItemPosition(item) {
const appIds = this._getFolderApps(); const appIndex = this._appIds.indexOf(item.id);
const appIndex = appIds.indexOf(item.id);
if (appIndex === -1) if (appIndex === -1)
return [-1, -1]; return [-1, -1];
@ -1660,10 +1660,8 @@ class FolderView extends BaseAppView {
} }
_compareItems(a, b) { _compareItems(a, b) {
const appIds = this._getFolderApps(); const aPosition = this._appIds.indexOf(a.id);
const bPosition = this._appIds.indexOf(b.id);
const aPosition = appIds.indexOf(a.id);
const bPosition = appIds.indexOf(b.id);
if (aPosition === -1 && bPosition === -1) if (aPosition === -1 && bPosition === -1)
return a.name.localeCompare(b.name); return a.name.localeCompare(b.name);
@ -1720,9 +1718,8 @@ class FolderView extends BaseAppView {
_loadApps() { _loadApps() {
let apps = []; let apps = [];
let appSys = Shell.AppSystem.get_default(); let appSys = Shell.AppSystem.get_default();
const appIds = this._getFolderApps();
appIds.forEach(appId => { this._appIds.forEach(appId => {
const app = appSys.lookup_app(appId); const app = appSys.lookup_app(appId);
let icon = this._items.get(appId); let icon = this._items.get(appId);
@ -1735,6 +1732,13 @@ class FolderView extends BaseAppView {
return apps; return apps;
} }
_redisplay() {
// Keep the app ids list cached
this._appIds = this._getFolderApps();
super._redisplay();
}
acceptDrop(source) { acceptDrop(source) {
if (!super.acceptDrop(source)) if (!super.acceptDrop(source))
return false; return false;