From 8d9da107100ee3a1395d0d69e7d21424003aa98f Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sat, 29 Jun 2019 13:15:20 -0300 Subject: [PATCH] frequentView: Use BaseAppView.addItem() and loadGrid() FrequentView is another view that is slightly not unified with how BaseAppView expects subclasses to load app icons. Instead of using BaseAppView.addItem() and then calling BaseAppview.loadGrid(), it adds the app icons directly to the icon grid. Make FrequentView add icons using BaseAppview.addItem(), and load the icons using BaseAppView.loadGrid(). https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/645 --- js/ui/appDisplay.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index cbd13b3f6..b1a2e5603 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -706,6 +706,11 @@ var FrequentView = class FrequentView extends BaseAppView { return this._usage.get_most_used().length >= MIN_FREQUENT_APPS_COUNT; } + _compareItems() { + // The FrequentView does not need to be sorted alphabetically + return 0; + } + _loadApps() { let mostUsed = this._usage.get_most_used(); let hasUsefulData = this.hasUsefulData(); @@ -726,8 +731,10 @@ var FrequentView = class FrequentView extends BaseAppView { continue; let appIcon = new AppIcon(mostUsed[i], { isDraggable: favoritesWritable }); - this._grid.addItem(appIcon, -1); + this.addItem(appIcon); } + + this.loadGrid(); } // Called before allocation to calculate dynamic spacing