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

layout: Skip strut computation in the no-monitor case

Browse Source 
It's possible for updateRegions() to be called before monitors have
been properly initialized. Instead of throwing an error in that case,
just skip the strut computation (that doesn't make sense anyway without
a monitor).

https://bugzilla.gnome.org/show_bug.cgi?id=781471
This commit is contained in:
Florian Müllner 2017-07-13 15:53:04 +02:00
parent 1ba014d9db
commit 4e57b45142
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/ui/layout.js
View File

@ -969,7 +969,11 @@ const LayoutManager = new Lang.Class({
if (actorData.affectsInputRegion && wantsInputRegion && actorData.actor.get_paint_visibility()) if (actorData.affectsInputRegion && wantsInputRegion && actorData.actor.get_paint_visibility())
rects.push(new Meta.Rectangle({ x: x, y: y, width: w, height: h })); rects.push(new Meta.Rectangle({ x: x, y: y, width: w, height: h }));
if (actorData.affectsStruts) { let monitor = null;
if (actorData.affectsStruts)
monitor = this.findMonitorForActor(actorData.actor);
if (monitor) {
// Limit struts to the size of the screen // Limit struts to the size of the screen
let x1 = Math.max(x, 0); let x1 = Math.max(x, 0);
let x2 = Math.min(x + w, global.screen_width); let x2 = Math.min(x + w, global.screen_width);
@ -986,7 +990,6 @@ const LayoutManager = new Lang.Class({
// spans the width/height across the middle of the // spans the width/height across the middle of the
// screen, then we don't create a strut for it at all. // screen, then we don't create a strut for it at all.
let monitor = this.findMonitorForActor(actorData.actor);
let side; let side;
if (x1 <= monitor.x && x2 >= monitor.x + monitor.width) { if (x1 <= monitor.x && x2 >= monitor.x + monitor.width) {
if (y1 <= monitor.y) if (y1 <= monitor.y)