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

magnifier: Use new cursor tracker API to keep wayland focus while hidden

Browse Source 
Since commit mutter/a2a8f0cda we force the focus surface of the
meta-wayland-pointer to NULL while the pointer is hidden. This
introduced an issue with the magnifier, where we use
`set_pointer_visible` to hide the real cursor and show our own cursor at
the correct position: Because the meta-wayland-pointer is still used to
communicate with Wayland clients, the UI of the windows will not respond
to mouse movement anymore as soon as the real cursor is hidden.

To fix this, use the newly added API of MetaCursorTracker to switch back
to the old behavior while the magnifier is hiding the system cursor.

In the future and as a more correct fix, we might want to rewrite the
magnifier so it doesn't have to hide the cursor and can simply show the
default one (eg. by scaling the actual view instead of a clone of the
view).

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/754
This commit is contained in:
Jonas Dreßler 2019-10-07 15:02:17 +02:00 committed by Florian Müllner
parent 24df43d579
commit 9476c9c4ca
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ui/magnifier.js
View File

@ -127,6 +127,8 @@ var Magnifier = class Magnifier {
* Show the system mouse pointer. * Show the system mouse pointer.
*/ */
showSystemCursor() { showSystemCursor() {
if (this._cursorTracker.set_keep_focus_while_hidden)
this._cursorTracker.set_keep_focus_while_hidden(false);
this._cursorTracker.set_pointer_visible(true); this._cursorTracker.set_pointer_visible(true);
} }
@ -135,6 +137,8 @@ var Magnifier = class Magnifier {
* Hide the system mouse pointer. * Hide the system mouse pointer.
*/ */
hideSystemCursor() { hideSystemCursor() {
if (this._cursorTracker.set_keep_focus_while_hidden)
this._cursorTracker.set_keep_focus_while_hidden(true);
this._cursorTracker.set_pointer_visible(false); this._cursorTracker.set_pointer_visible(false);
} }