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

keyboard: Reset latched levels on string commit on all situations

Browse source 
The _commitAction() paths have early returns, which made resetting the
latched mode inconsistent depending on the paths taken to commit the
string. This made latched modes not return to normal on e.g. Shell
entries.

Make this happen outside the function, and after the only calling
point, so that the level is correctly reset on all situations.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2945>
(cherry picked from commit 08f3ad3835)
This commit is contained in:
Carlos Garnacho 2023-09-08 18:51:34 +02:00 • committed by Florian Müllner
parent 673e784572
commit 23787e391d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/ui/keyboard.js
View file

@ -1527,7 +1527,10 @@ var Keyboard = GObject.registerClass({
if (key.action !== 'modifier') {
button.connect('commit', (_actor, keyval, str) => {
this._commitAction(keyval, str);
this._commitAction(keyval, str).then(() => {
if (!this._latched)
this._setActiveLayer(0);
});
});
}
@ -1607,9 +1610,6 @@ var Keyboard = GObject.registerClass({
});
}
}
if (!this._latched)
this._setActiveLayer(0);
}
_previousWordPosition(text, cursor) {