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

cleanup: Rename signals/methods that will conflict with Clutter.Actor

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/559
This commit is contained in:
Marco Trevisan (Treviño)
2019-08-28 23:06:14 +03:00
committed by Florian Müllner
parent ab6a629955
commit 0353a5bf2c
8 changed files with 66 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/search.js
View File

@ -148,6 +148,7 @@ var SearchResultsBase = class {
this._resultsView = resultsView;
this._terms = [];
this._focusChild = null;
this.actor = new St.BoxLayout({ style_class: 'search-section',
vertical: true });
@ -190,8 +191,15 @@ var SearchResultsBase = class {
this.actor.hide();
}
get focusChild() {
return this._focusChild;
}
_keyFocusIn(actor) {
this.emit('key-focus-in', actor);
if (this._focusChild == actor)
return;
this._focusChild = actor;
this.emit('focus-child-changed');
}
_setMoreCount(_count) {
@ -595,8 +603,8 @@ var SearchResultsView = class {
return false;
}
_keyFocusIn(provider, actor) {
Util.ensureActorVisibleInScrollView(this._scrollView, actor);
_focusChildChanged(provider) {
Util.ensureActorVisibleInScrollView(this._scrollView, provider.focusChild);
}
_ensureProviderDisplay(provider) {
@ -609,7 +617,7 @@ var SearchResultsView = class {
else
providerDisplay = new GridSearchResults(provider, this);
providerDisplay.connect('key-focus-in', this._keyFocusIn.bind(this));
providerDisplay.connect('focus-child-changed', this._focusChildChanged.bind(this));
providerDisplay.actor.hide();
this._content.add(providerDisplay.actor);
provider.display = providerDisplay;