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

iconGrid/iconGridLayout: Simplify _findBestIconSize()

Browse Source 
The 'bestSize' variable isn't necessary anymore, remove it in favor of
simply returning the 'size' or, if no suitable size found, IconSize.TINY.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1518>
This commit is contained in:
Georges Basile Stavracas Neto 2020-12-01 17:58:09 -03:00 committed by Marge Bot
parent 7d4ac04a78
commit b120b17d01
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/ui/iconGrid.js
View File

@ -403,7 +403,6 @@ var IconGridLayout = GObject.registerClass({
if (this._fixedIconSize !== -1) if (this._fixedIconSize !== -1)
return this._fixedIconSize; return this._fixedIconSize;
let bestSize;
const iconSizes = Object.values(IconSize).sort((a, b) => b - a); const iconSizes = Object.values(IconSize).sort((a, b) => b - a);
for (const size of iconSizes) { for (const size of iconSizes) {
let usedWidth, usedHeight; let usedWidth, usedHeight;
@ -429,13 +428,11 @@ var IconGridLayout = GObject.registerClass({
this._pageHeight - usedHeight - rowSpacingPerPage - this._pageHeight - usedHeight - rowSpacingPerPage -
this._pagePadding.top - this._pagePadding.bottom; this._pagePadding.top - this._pagePadding.bottom;
bestSize = size;
if (emptyHSpace >= 0 && emptyVSpace > 0) if (emptyHSpace >= 0 && emptyVSpace > 0)
break; return size;
} }
return bestSize; return IconSize.TINY;
} }
_getChildrenMaxSize() { _getChildrenMaxSize() {