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

search: Highlight search terms in description

Browse Source 
The classes extending the SearchResult can now connect
to the 'terms-changed' signal emitted by the SearchResult
class. This signal enables each object to update its
internal description in order to apply the bold style
onto strings that match the search terms.

https://bugzilla.gnome.org/show_bug.cgi?id=749957
This commit is contained in:
Rares Visalom 2017-06-28 01:01:13 +03:00 committed by Florian Müllner
parent 77e0c38d82
commit b3d74bdb0f
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
js/ui/search.js
View File

@ -84,6 +84,8 @@ const ListSearchResult = new Lang.Class({
vertical: false }); vertical: false });
this.actor.set_child(content); this.actor.set_child(content);
this._termsChangedId = 0;
let titleBox = new St.BoxLayout({ style_class: 'list-search-result-title' }); let titleBox = new St.BoxLayout({ style_class: 'list-search-result-title' });
content.add(titleBox, { x_fill: true, content.add(titleBox, { x_fill: true,
@ -106,14 +108,31 @@ const ListSearchResult = new Lang.Class({
this.actor.label_actor = title; this.actor.label_actor = title;
if (this.metaInfo['description']) { if (this.metaInfo['description']) {
let description = new St.Label({ style_class: 'list-search-result-description', this._descriptionLabel = new St.Label({ style_class: 'list-search-result-description' });
text: this.metaInfo['description'] }); content.add(this._descriptionLabel, { x_fill: false,
y_fill: false,
x_align: St.Align.START,
y_align: St.Align.MIDDLE });
content.add(description, { x_fill: false, this._termsChangedId =
y_fill: false, this._resultsView.connect('terms-changed',
x_align: St.Align.START, Lang.bind(this, this._highlightTerms));
y_align: St.Align.MIDDLE });
this._highlightTerms();
} }
this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
},
_highlightTerms: function() {
let markup = this._resultsView.highlightTerms(this.metaInfo['description']);
this._descriptionLabel.clutter_text.set_markup(markup);
},
_onDestroy: function() {
if (this._termsChangedId)
this._resultsView.disconnect(this._termsChangedId);
this._termsChangedId = 0;
} }
}); });
@ -234,7 +253,6 @@ const SearchResultsBase = new Lang.Class({
updateSearch: function(providerResults, terms, callback) { updateSearch: function(providerResults, terms, callback) {
this._terms = terms; this._terms = terms;
if (providerResults.length == 0) { if (providerResults.length == 0) {
this._clearResultDisplay(); this._clearResultDisplay();
this.actor.hide(); this.actor.hide();
@ -423,6 +441,8 @@ const SearchResults = new Lang.Class({
this._providers = []; this._providers = [];
this._highlightRegex = null;
this._searchSettings = new Gio.Settings({ schema_id: SEARCH_PROVIDERS_SCHEMA }); this._searchSettings = new Gio.Settings({ schema_id: SEARCH_PROVIDERS_SCHEMA });
this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders)); this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
this._searchSettings.connect('changed::enabled', Lang.bind(this, this._reloadRemoteProviders)); this._searchSettings.connect('changed::enabled', Lang.bind(this, this._reloadRemoteProviders));
@ -542,6 +562,11 @@ const SearchResults = new Lang.Class({
if (this._searchTimeoutId == 0) if (this._searchTimeoutId == 0)
this._searchTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 150, Lang.bind(this, this._onSearchTimeout)); this._searchTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, 150, Lang.bind(this, this._onSearchTimeout));
let escapedTerms = this._terms.map(term => Shell.util_regex_escape(term));
this._highlightRegex = new RegExp(`(${escapedTerms.join('|')})`, 'gi');
this.emit('terms-changed');
}, },
_onPan: function(action) { _onPan: function(action) {
@ -680,8 +705,19 @@ const SearchResults = new Lang.Class({
} else { } else {
result.actor.remove_style_pseudo_class('selected'); result.actor.remove_style_pseudo_class('selected');
} }
},
highlightTerms: function(description) {
if (!description)
return '';
if (!this._highlightRegex)
return description;
return description.replace(this._highlightRegex, '<b>$1</b>');
} }
}); });
Signals.addSignalMethods(SearchResults.prototype);
const ProviderInfo = new Lang.Class({ const ProviderInfo = new Lang.Class({
Name: 'ProviderInfo', Name: 'ProviderInfo',