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

search: Don't use max number of results if allocation width is 0

Browse Source 
Since commit 1a27ff6130 we use the
allocation width of the GridSearchResults actor to calculate the max
number of results that can be shown for this search provider.

On the first run of the search, when no previous (cached) allocation is
available for the actor of GridSearchResults, the allocation width used
in `_getMaxDisplayedResults` will be 0, which in turn will make
`updateSearch` filter out all results returned by the search provider.

Now if this search provider is the only search provider that's enabled,
after calling `updateSearch`, the `SearchResults` class will call
`_updateSearchProgress` to check if any results are visible, assume
nothing was found and therefore hide the scrollView. This in turn causes
the GridSearchResults actor to not get a new allocation, which prevents
our code to fixup the max number of results on `notify::allocation` from
working: The number will continue to be 0 and we'll never show any
results.

To fix this regression, return -1 in `_getMaxDisplayedResults` if the
allocation width is 0 to inform `updateSearch` that we can't calculate
the maximum number yet and interpret a return value of -1 as "show all
results" in `updateSearch`. The same problem would probably also appear
if the allocation width is anything between 0 and the width of the
iconGrid with one icon in it, although this might as well be a valid
width in case a very small screen is used or with very large icons. So
let's only check for a width of 0 and hope the GridSearchResults actor
won't get weird temporary allocations in that range.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/672
This commit is contained in:
Jonas Dreßler 2019-08-07 16:42:17 +02:00 committed by Florian Müllner
parent 87f5aa7a13
commit 68e3f74ffd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/search.js
View File

@ -245,7 +245,9 @@ var SearchResultsBase = class {
callback(); callback();
} else { } else {
let maxResults = this._getMaxDisplayedResults(); let maxResults = this._getMaxDisplayedResults();
let results = this.provider.filterResults(providerResults, maxResults); let results = maxResults > -1
? this.provider.filterResults(providerResults, maxResults)
: providerResults;
let moreCount = Math.max(providerResults.length - results.length, 0); let moreCount = Math.max(providerResults.length - results.length, 0);
this._ensureResultActors(results, successful => { this._ensureResultActors(results, successful => {
@ -353,8 +355,11 @@ var GridSearchResults = class extends SearchResultsBase {
} }
_getMaxDisplayedResults() { _getMaxDisplayedResults() {
let allocation = this.actor.allocation; let width = this.actor.allocation.x2 - this.actor.allocation.x1;
let nCols = this._grid.columnsForWidth(allocation.x2 - allocation.x1); if (width == 0)
return -1;
let nCols = this._grid.columnsForWidth(width);
return nCols * this._grid.getRowLimit(); return nCols * this._grid.getRowLimit();
} }