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

ibusManager: Simplify code and logic for setEngine()

Browse Source 
Reword names, functions and refactor code to make code execution logic
simpler to understand.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3439>
This commit is contained in:
Sundeep Mediratta 2024-08-04 13:24:17 -04:00 committed by Florian Müllner
parent 961ca226bd
commit 39a3da654d
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/misc/ibusManager.js
View File

@ -294,18 +294,23 @@ class IBusManager extends Signals.EventEmitter {
async setEngine(id) { async setEngine(id) {
if (this._oskCompletion) if (this._oskCompletion)
this._preOskEngine = id; await this._maybeUpdateCompletion(id);
const isXkb = id.startsWith('xkb:');
if (this._oskCompletion && isXkb)
return;
if (this._oskCompletion)
await this.setCompletionEnabled(false);
else else
await this._setEngine(id); await this._setEngine(id);
} }
async _maybeUpdateCompletion(id) {
if (!this._oskCompletion)
return;
this._preOskEngine = id;
const isXkb = id.startsWith('xkb:');
/* Non xkb engines conflict with completion */
if (!isXkb)
await this.setCompletionEnabled(false);
}
preloadEngines(ids) { preloadEngines(ids) {
if (!this._ibus || !this._ready) if (!this._ibus || !this._ready)
return; return;