edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-18 07:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-reset' into 'main'

Browse source 
searchController: Maintain focus in the search entry when it has no text

Closes #7592

See merge request GNOME/gnome-shell!3302
This commit is contained in:
Shiki Okasaka 2024-06-30 07:20:33 +00:00
commit d05417f671
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
js/ui/searchController.js
View file

@ -122,7 +122,14 @@ export const SearchController = GObject.registerClass({
}
vfunc_unmap() {
this.reset();
// Leave the entry focused when it doesn't have any text;
// when replacing a selected search term, Clutter emits
// two 'text-changed' signals, one for deleting the previous
// text and one for the new one - the second one is handled
// incorrectly when we remove focus
// (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */
if (this._text.text !== '')
this.reset();
super.vfunc_unmap();
}
@ -162,16 +169,8 @@ export const SearchController = GObject.registerClass({
}
_searchCancelled() {
// vfunc_unmap() is indirectly called by the following line.
this._setSearchActive(false);
// Leave the entry focused when it doesn't have any text;
// when replacing a selected search term, Clutter emits
// two 'text-changed' signals, one for deleting the previous
// text and one for the new one - the second one is handled
// incorrectly when we remove focus
// (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */
if (this._text.text !== '')
this.reset();
}
reset() {