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

iconGrid: Merge PaginatedIconGrid and IconGrid

Browse Source 
Now that the only user of the IconGrid is AppDisplay, and
it only uses the paginated icon grid, there's no point in
having the two classes split anymore.

In addition to that, future commits will introduce a layout
manager that will extend current icon grid features, and
merging PaginatedIconGrid and IconGrid in the same class will
vastly simplify this transition.

Merge PaginatedIconGrid into IconGrid, and adapt AppDisplay
to this change.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1267
This commit is contained in:
Georges Basile Stavracas Neto
2020-05-18 23:01:41 -03:00
parent 846fa77b37
commit f09fbb19cf
2 changed files with 49 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/ui/appDisplay.js
View File

@ -138,11 +138,7 @@ var BaseAppView = GObject.registerClass({
padWithSpacing: true,
}, true);
if (this.use_pagination)
this._grid = new IconGrid.PaginatedIconGrid(gridParams);
else
this._grid = new IconGrid.IconGrid(gridParams);
this._grid = new IconGrid.IconGrid(gridParams);
this._grid.connect('child-focused', (grid, actor) => {
this._childFocused(actor);
});
@ -331,7 +327,6 @@ class AppDisplay extends BaseAppView {
layout_manager: new Clutter.BinLayout(),
x_expand: true,
y_expand: true,
use_pagination: true,
});
this._grid._delegate = this;