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

keyboard: Keep OSK widgetry for a single group

Browse Source 
Keep enough widgetry in memory for just the current group,
this means we more eagerly destroy and re-create actors on
language changes.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3162>
This commit is contained in:
Carlos Garnacho 2024-01-26 17:20:00 +01:00
parent 35bfb4501d
commit 0131408c0d
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
js/ui/keyboard.js
View File

@ -1380,7 +1380,6 @@ export const Keyboard = GObject.registerClass({
this._keyboardController = new KeyboardController(); this._keyboardController = new KeyboardController();
this._groups = {};
this._currentPage = null; this._currentPage = null;
this._suggestions = new Suggestions(); this._suggestions = new Suggestions();
@ -1461,10 +1460,15 @@ export const Keyboard = GObject.registerClass({
} }
} }
_createLayersForGroup(groupName) { _updateLayoutForGroup(groupName) {
let keyboardModel = new KeyboardModel(groupName); let keyboardModel = new KeyboardModel(groupName);
let layers = {};
let levels = keyboardModel.getLevels(); let levels = keyboardModel.getLevels();
let layers = {};
let layout = new Clutter.Actor({
layout_manager: new Clutter.BinLayout(),
x_expand: true,
y_expand: true,
});
for (let i = 0; i < levels.length; i++) { for (let i = 0; i < levels.length; i++) {
let currentLevel = levels[i]; let currentLevel = levels[i];
/* There are keyboard maps which consist of 3 levels (no uppercase, /* There are keyboard maps which consist of 3 levels (no uppercase,
@ -1473,19 +1477,21 @@ export const Keyboard = GObject.registerClass({
*/ */
let level = i >= 1 && levels.length === 3 ? i + 1 : i; let level = i >= 1 && levels.length === 3 ? i + 1 : i;
let layout = new KeyContainer(); let levelLayout = new KeyContainer();
layout.shiftKeys = []; levelLayout.shiftKeys = [];
layout.mode = currentLevel.mode; levelLayout.mode = currentLevel.mode;
this._loadRows(currentLevel, level, levels.length, layout); this._loadRows(currentLevel, level, levels.length, levelLayout);
layers[level] = layout; layers[level] = levelLayout;
this._aspectContainer.add_child(layout); layout.add_child(levelLayout);
layout.layoutButtons(); levelLayout.layoutButtons();
levelLayout.hide();
layout.hide();
} }
return layers; this._aspectContainer.add_child(layout);
this._currentLayout?.destroy();
this._currentLayout = layout;
this._layers = layers;
} }
_ensureKeys() { _ensureKeys() {
@ -1495,8 +1501,7 @@ export const Keyboard = GObject.registerClass({
else else
group = this._keyboardController.getCurrentGroup(); group = this._keyboardController.getCurrentGroup();
if (!this._groups[group]) this._updateLayoutForGroup(group);
this._groups[group] = this._createLayersForGroup(group);
} }
_addRowKeys(keys, layout) { _addRowKeys(keys, layout) {
@ -1805,12 +1810,6 @@ export const Keyboard = GObject.registerClass({
} }
_onKeyboardGroupsChanged() { _onKeyboardGroupsChanged() {
let nonGroupActors = [this._emojiSelection, this._keypad];
this._aspectContainer.get_children().filter(c => !nonGroupActors.includes(c)).forEach(c => {
c.destroy();
});
this._groups = {};
this._onGroupChanged(); this._onGroupChanged();
} }
@ -1850,8 +1849,7 @@ export const Keyboard = GObject.registerClass({
} }
_setActiveLayer(activeLevel) { _setActiveLayer(activeLevel) {
let activeGroupName = this._keyboardController.getCurrentGroup(); const layers = this._layers;
let layers = this._groups[activeGroupName];
let currentPage = layers[activeLevel]; let currentPage = layers[activeLevel];
if (this._currentPage === currentPage) { if (this._currentPage === currentPage) {