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

keyboard: Move monitor management to KeyboardController

Browse Source 
Instead of setting it deep down, manage it at the higher level.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1668>
This commit is contained in:
Carlos Garnacho 2021-02-11 16:44:28 +01:00 committed by Marge Bot
parent 0a12405e01
commit 3346e9923b
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/keyboard.js
View File

@ -1194,8 +1194,10 @@ var KeyboardManager = class KeyBoardManager {
} }
open(monitor) { open(monitor) {
Main.layoutManager.keyboardIndex = monitor;
if (this._keyboard) if (this._keyboard)
this._keyboard.open(monitor); this._keyboard.open();
} }
close() { close() {
@ -1723,15 +1725,12 @@ var Keyboard = GObject.registerClass({
this._keyboardRestingId = 0; this._keyboardRestingId = 0;
} }
open(monitor) { open() {
this._clearShowIdle(); this._clearShowIdle();
this._keyboardRequested = true; this._keyboardRequested = true;
if (this._keyboardVisible) { if (this._keyboardVisible) {
if (monitor != Main.layoutManager.keyboardIndex) { this._relayout();
Main.layoutManager.keyboardIndex = monitor;
this._relayout();
}
return; return;
} }
@ -1740,17 +1739,16 @@ var Keyboard = GObject.registerClass({
KEYBOARD_REST_TIME, KEYBOARD_REST_TIME,
() => { () => {
this._clearKeyboardRestTimer(); this._clearKeyboardRestTimer();
this._open(monitor); this._open();
return GLib.SOURCE_REMOVE; return GLib.SOURCE_REMOVE;
}); });
GLib.Source.set_name_by_id(this._keyboardRestingId, '[gnome-shell] this._clearKeyboardRestTimer'); GLib.Source.set_name_by_id(this._keyboardRestingId, '[gnome-shell] this._clearKeyboardRestTimer');
} }
_open(monitor) { _open() {
if (!this._keyboardRequested) if (!this._keyboardRequested)
return; return;
Main.layoutManager.keyboardIndex = monitor;
this._relayout(); this._relayout();
this.animateShow(); this.animateShow();