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

keyboard: Simplify group change emission at KeyboardController

Browse Source 
Since we now just store the current group, we do not need to track
closely source changes vs selection changes in the available sources.
We just re-generate the current OSK keymap for all, so coalesce both
signals into a more generic "group-changed".

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3162>
This commit is contained in:
Carlos Garnacho
2024-01-26 20:22:14 +01:00
parent 50e8203ce7
commit c6d2f7d6c4
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/keyboard.js
View File

@ -1335,8 +1335,7 @@ export const Keyboard = GObject.registerClass({
this._updateKeys();
this._keyboardController.connectObject(
'active-group', this._onGroupChanged.bind(this),
'groups-changed', this._onKeyboardGroupsChanged.bind(this),
'group-changed', this._onGroupChanged.bind(this),
'panel-state', this._onKeyboardStateChanged.bind(this),
'purpose-changed', this._onPurposeChanged.bind(this),
this);
@ -1755,10 +1754,6 @@ export const Keyboard = GObject.registerClass({
this._updateKeys();
}
_onKeyboardGroupsChanged() {
this._onGroupChanged();
}
_onKeyboardStateChanged(controller, state) {
let enabled;
if (state === Clutter.InputPanelState.OFF)
@ -2101,13 +2096,13 @@ class KeyboardController extends Signals.EventEmitter {
}
_onSourcesModified() {
this.emit('groups-changed');
this.emit('group-changed');
}
_onSourceChanged(inputSourceManager, _oldSource) {
let source = inputSourceManager.currentSource;
this._currentSource = source;
this.emit('active-group', source.id);
this.emit('group-changed');
}
_onContentPurposeHintsChanged(method) {