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

status/keyboard: Ignore purpose hint changes while keymap switcher is shown

Browse Source 
If we are getting purpose hint changes while the language switcher is popped
up, this likely means the purpose hint was actually triggered by the key
focus change induced by the language switcher popping up.

In this case, we on one hand would like to preserve the state that applied
before thise focus change, and on the other we very much want to avoid the
keymap change that would forget about the keys being pressed.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6066
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2534>
This commit is contained in:
Carlos Garnacho 2022-11-11 13:13:41 +01:00 committed by Marge Bot
parent d918290ac8
commit 2e8e1fe8fc
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/status/keyboard.js
View File

@ -411,9 +411,14 @@ var InputSourceManager = class extends Signals.EventEmitter {
return;
}
let popup = new InputSourcePopup(this._mruSources, this._keybindingAction, this._keybindingActionBackward);
if (!popup.show(binding.is_reversed(), binding.get_name(), binding.get_mask()))
popup.fadeAndDestroy();
this._switcherPopup = new InputSourcePopup(
this._mruSources, this._keybindingAction, this._keybindingActionBackward);
this._switcherPopup.connect('destroy', () => {
this._switcherPopup = null;
});
if (!this._switcherPopup.show(
binding.is_reversed(), binding.get_name(), binding.get_mask()))
this._switcherPopup.fadeAndDestroy();
}
_keyboardOptionsChanged() {
@ -675,6 +680,10 @@ var InputSourceManager = class extends Signals.EventEmitter {
}
_ibusSetContentType(im, purpose, _hints) {
// Avoid purpose changes while the switcher popup is shown, likely due to
// the focus change caused by the switcher popup causing this purpose change.
if (this._switcherPopup)
return;
if (purpose == IBus.InputPurpose.PASSWORD) {
if (Object.keys(this._inputSources).length == Object.keys(this._ibusSources).length)
return;