From 3346e9923b47be0acaf7865a51b20a7578be88af Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 11 Feb 2021 16:44:28 +0100
Subject: [PATCH] keyboard: Move monitor management to KeyboardController

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

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1668>
---
 js/ui/keyboard.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

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