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

keyboard: Don't include keyboard devices when updating lastDevice

Browse Source 
We're dealing with attached keyboards now using the touch_mode property
of ClutterSeat: If a device has a keyboard attached, the touch-mode is
FALSE and we won't automatically show the OSK on touches, also the
touch-mode gets set to FALSE when an external keyboard is being plugged
in, so that also hides the OSK automatically.

With that, we can now ignore keyboard devices when updating the last
used device and no longer have to special-case our own virtual devices.

Because there was no special-case for the virtual device we use on
Wayland now, this fixes a bug where the keyboard disappeared after
touching keys like Enter or Backspace.

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2287

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1142
This commit is contained in:
Jonas Dreßler 2020-03-28 14:15:09 +01:00 committed by Florian Müllner
parent 97fe4f761a
commit 8dfed7e762
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/keyboard.js
View File

@ -1120,10 +1120,11 @@ var KeyboardManager = class KeyBoardManager {
this._lastDevice = null; this._lastDevice = null;
Meta.get_backend().connect('last-device-changed', (backend, device) => { Meta.get_backend().connect('last-device-changed', (backend, device) => {
if (device.get_device_name().indexOf('XTEST') < 0) { if (device.device_type === Clutter.InputDeviceType.KEYBOARD_DEVICE)
this._lastDevice = device; return;
this._syncEnabled();
} this._lastDevice = device;
this._syncEnabled();
}); });
this._syncEnabled(); this._syncEnabled();
} }