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

keyboard: Honor emoji-visible through input hints

Browse Source 
And fix it so it is effective again. This is a small piece of
smarts the code needs to earn, so that keys with the "emoji"
action are hidden, and their width assigned to the next key.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3162>
This commit is contained in:
Carlos Garnacho 2024-01-26 19:54:39 +01:00
parent 99ab1988d2
commit 50e8203ce7
1 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
js/ui/keyboard.js
View File

@ -1232,7 +1232,6 @@ export const Keyboard = GObject.registerClass({
this._modifierKeys = new Map(); this._modifierKeys = new Map();
this._suggestions = null; this._suggestions = null;
this._emojiKeyVisible = Meta.is_wayland_compositor();
this._focusTracker = new FocusTracker(); this._focusTracker = new FocusTracker();
this._focusTracker.connectObject( this._focusTracker.connectObject(
@ -1344,11 +1343,6 @@ export const Keyboard = GObject.registerClass({
global.stage.connectObject('notify::key-focus', global.stage.connectObject('notify::key-focus',
this._onKeyFocusChanged.bind(this), this); this._onKeyFocusChanged.bind(this), this);
if (Meta.is_wayland_compositor()) {
this._keyboardController.connectObject('emoji-visible',
this._onEmojiKeyVisible.bind(this), this);
}
this._relayout(); this._relayout();
} }
@ -1418,12 +1412,23 @@ export const Keyboard = GObject.registerClass({
return; return;
} }
const emojiVisible = Meta.is_wayland_compositor() &&
(purpose === Clutter.InputContentPurpose.NORMAL ||
purpose === Clutter.InputContentPurpose.ALPHA ||
purpose === Clutter.InputContentPurpose.PASSWORD ||
purpose === Clutter.InputContentPurpose.TERMINAL);
keyboardModel.getLevels().forEach(currentLevel => { keyboardModel.getLevels().forEach(currentLevel => {
let levelLayout = new KeyContainer(); let levelLayout = new KeyContainer();
levelLayout.shiftKeys = []; levelLayout.shiftKeys = [];
levelLayout.mode = currentLevel.mode; levelLayout.mode = currentLevel.mode;
this._loadRows(currentLevel, levelLayout); const rows = currentLevel.rows;
rows.forEach(row => {
levelLayout.appendRow();
this._addRowKeys(row, levelLayout, emojiVisible);
});
layers[currentLevel.level] = levelLayout; layers[currentLevel.level] = levelLayout;
layout.add_child(levelLayout); layout.add_child(levelLayout);
levelLayout.layoutButtons(); levelLayout.layoutButtons();
@ -1441,12 +1446,24 @@ export const Keyboard = GObject.registerClass({
this._updateLayout(group, this._purpose); this._updateLayout(group, this._purpose);
} }
_addRowKeys(keys, layout) { _addRowKeys(keys, layout, emojiVisible) {
let accumulatedWidth = 0;
for (let i = 0; i < keys.length; ++i) { for (let i = 0; i < keys.length; ++i) {
const key = keys[i]; const key = keys[i];
const {strings} = key; const {strings} = key;
const commitString = strings?.shift(); const commitString = strings?.shift();
if (key.action === 'emoji' && !emojiVisible) {
accumulatedWidth = key.width ?? 1;
continue;
}
if (accumulatedWidth > 0) {
// Pass accumulated width onto the next key
key.width = (key.width ?? 1) + accumulatedWidth;
accumulatedWidth = 0;
}
let button = new Key({ let button = new Key({
commitString, commitString,
label: key.label, label: key.label,
@ -1700,14 +1717,6 @@ export const Keyboard = GObject.registerClass({
} }
} }
_loadRows(model, layout) {
let rows = model.rows;
for (let i = 0; i < rows.length; ++i) {
layout.appendRow();
this._addRowKeys(rows[i], layout);
}
}
_getGridSlots() { _getGridSlots() {
let numOfHorizSlots = 0, numOfVertSlots; let numOfHorizSlots = 0, numOfVertSlots;
let rows = this._currentPage.get_children(); let rows = this._currentPage.get_children();
@ -1750,15 +1759,6 @@ export const Keyboard = GObject.registerClass({
this._onGroupChanged(); this._onGroupChanged();
} }
_onEmojiKeyVisible(controller, visible) {
if (visible === this._emojiKeyVisible)
return;
this._emojiKeyVisible = visible;
/* Rebuild keyboard widgetry to include emoji button */
this._onKeyboardGroupsChanged();
}
_onKeyboardStateChanged(controller, state) { _onKeyboardStateChanged(controller, state) {
let enabled; let enabled;
if (state === Clutter.InputPanelState.OFF) if (state === Clutter.InputPanelState.OFF)
@ -2111,16 +2111,7 @@ class KeyboardController extends Signals.EventEmitter {
} }
_onContentPurposeHintsChanged(method) { _onContentPurposeHintsChanged(method) {
let purpose = method.content_purpose; const purpose = method.content_purpose;
let emojiVisible = false;
if (purpose === Clutter.InputContentPurpose.NORMAL ||
purpose === Clutter.InputContentPurpose.ALPHA ||
purpose === Clutter.InputContentPurpose.PASSWORD ||
purpose === Clutter.InputContentPurpose.TERMINAL)
emojiVisible = true;
this.emit('emoji-visible', emojiVisible);
this.emit('purpose-changed', purpose); this.emit('purpose-changed', purpose);
} }