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

keyboard: Handle case where keyboardMonitor is unset

Browse Source 
This may be the case where keyboardIndex is -1, which may be the
case where either the keyboard monitor hasn't been set yet, or
the keyboard is being unmanaged and meta_window_get_monitor
returns -1

https://bugzilla.gnome.org/show_bug.cgi?id=788882


(cherry picked from commit 19e864ed3b85278ed1a9527ce3c29646328c19ec)
This commit is contained in:
Sam Spilsbury 2017-10-11 10:59:19 +00:00 committed by Marco Trevisan
parent a662e7bb87
commit e94af71430
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/keyboard.js
View File

@ -924,9 +924,11 @@ var Keyboard = new Lang.Class({
}, },
_relayout() { _relayout() {
if (this.actor == null)
return;
let monitor = Main.layoutManager.keyboardMonitor; let monitor = Main.layoutManager.keyboardMonitor;
if (this.actor == null || monitor == null)
return;
let maxHeight = monitor.height / 3; let maxHeight = monitor.height / 3;
this.actor.width = monitor.width; this.actor.width = monitor.width;
this.actor.height = maxHeight; this.actor.height = maxHeight;