From 783dbe2aa98e5843e5f016c2558c5d16a2df4ae4 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Tue, 26 May 2020 18:55:18 -0300 Subject: [PATCH] appDisplay: Don't resort folders when name changes With a customizable app grid, we don't want folders to move after renaming. Their position is fixed. Remove the sort-after-rename code from AppDisplay. https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1284 --- js/ui/appDisplay.js | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index a31007ddc..0e14d376c 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -16,7 +16,6 @@ const PopupMenu = imports.ui.popupMenu; const Search = imports.ui.search; const SwipeTracker = imports.ui.swipeTracker; const Params = imports.misc.params; -const Util = imports.misc.util; const SystemActions = imports.misc.systemActions; var MENU_POPUP_TIMEOUT = 600; @@ -755,23 +754,6 @@ class AppDisplay extends BaseAppView { this._pageManager.pages = pages; } - _itemNameChanged(item) { - // If an item's name changed, we can pluck it out of where it's - // supposed to be and reinsert it where it's sorted. - let oldIdx = this._orderedItems.indexOf(item); - this._orderedItems.splice(oldIdx, 1); - let newIdx = Util.insertSorted(this._orderedItems, item, this._compareItems.bind(this)); - - this._grid.removeItem(item); - - const { itemsPerPage } = this._grid; - const page = Math.floor(newIdx / itemsPerPage); - const position = newIdx % itemsPerPage; - this._grid.addItem(item, page, position); - - this.selectApp(item.id); - } - getAppInfos() { return this._appInfoList; } @@ -821,7 +803,6 @@ class AppDisplay extends BaseAppView { let icon = this._items.get(id); if (!icon) { icon = new FolderIcon(id, path, this); - icon.connect('name-changed', this._itemNameChanged.bind(this)); icon.connect('apps-changed', this._redisplay.bind(this)); } @@ -1595,7 +1576,6 @@ class FolderView extends BaseAppView { var FolderIcon = GObject.registerClass({ Signals: { 'apps-changed': {}, - 'name-changed': {}, }, }, class FolderIcon extends AppViewItem { _init(id, path, parentView) { @@ -1729,7 +1709,6 @@ var FolderIcon = GObject.registerClass({ this._name = name; this.icon.label.text = this.name; - this.emit('name-changed'); } _sync() {