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

When setting a search, do a redisplay immediately

Browse Source 
Commit 94bd6f1718 introduced a trick
where we only do the heavy lifting for "redisplay" when we're mapped.

However, the search system wants to get the count of matched items,
and control the visibility of the display based on that.  This introduces
a circularity; avoid it by forcing the search to do a redisplay.

In the future we should avoid this by separating out the "get matched
things for search" from "display list of things".

https://bugzilla.gnome.org/show_bug.cgi?id=600890
This commit is contained in:
Colin Walters 2009-11-05 17:19:36 -05:00
parent 2f27f61a1f
commit 07a8d5ed2d
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/genericDisplay.js
View File

@ -20,7 +20,8 @@ const Main = imports.ui.main;
const RedisplayFlags = { NONE: 0, const RedisplayFlags = { NONE: 0,
RESET_CONTROLS: 1 << 0, RESET_CONTROLS: 1 << 0,
FULL: 1 << 1, FULL: 1 << 1,
SUBSEARCH: 1 << 2 }; SUBSEARCH: 1 << 2,
IMMEDIATE: 1 << 3 };
const ITEM_DISPLAY_NAME_COLOR = new Clutter.Color(); const ITEM_DISPLAY_NAME_COLOR = new Clutter.Color();
ITEM_DISPLAY_NAME_COLOR.from_pixel(0xffffffff); ITEM_DISPLAY_NAME_COLOR.from_pixel(0xffffffff);
@ -369,16 +370,18 @@ GenericDisplay.prototype = {
// Sets the search string and displays the matching items. // Sets the search string and displays the matching items.
setSearch: function(text) { setSearch: function(text) {
let lowertext = text.toLowerCase(); let lowertext = text.toLowerCase();
if (lowertext == this._search) if (lowertext == this._search) {
return; return;
let flags = RedisplayFlags.RESET_CONTROLS; }
let flags = RedisplayFlags.RESET_CONTROLS | RedisplayFlags.IMMEDIATE;
if (this._search != '') { if (this._search != '') {
// Because we combine search terms with OR, we have to be sure that no new term // Because we combine search terms with OR, we have to be sure that no new term
// was introduced before deciding that the new search results will be a subset of // was introduced before deciding that the new search results will be a subset of
// the existing search results. // the existing search results.
if (lowertext.indexOf(this._search) == 0 && if (lowertext.indexOf(this._search) == 0 &&
lowertext.split(/\s+/).length == this._search.split(/\s+/).length) lowertext.split(/\s+/).length == this._search.split(/\s+/).length) {
flags |= RedisplayFlags.SUBSEARCH; flags |= RedisplayFlags.SUBSEARCH;
}
} }
this._search = lowertext; this._search = lowertext;
this._redisplay(flags); this._redisplay(flags);
@ -643,9 +646,13 @@ GenericDisplay.prototype = {
* SUBSEARCH - Indicates that the current _search is a superstring of the previous * SUBSEARCH - Indicates that the current _search is a superstring of the previous
* one, which implies we only need to re-search through previous results. * one, which implies we only need to re-search through previous results.
* FULL - Indicates that we need recreate all displayed items; implies RESET_CONTROLS as well * FULL - Indicates that we need recreate all displayed items; implies RESET_CONTROLS as well
* IMMEDIATE - Do the full redisplay even if we're not mapped. This is useful
* if you want to get the number of matched items and show/hide a section based on
* that number.
*/ */
_redisplay: function(flags) { _redisplay: function(flags) {
if (!this._list.mapped) { let immediate = (flags & RedisplayFlags.IMMEDIATE) > 0;
if (!immediate && !this._list.mapped) {
this._pendingRedisplay |= flags; this._pendingRedisplay |= flags;
return; return;
} }