summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Müllner <fmuellner@gnome.org>2014-06-11 02:16:43 +0200
committerFlorian Müllner <fmuellner@gnome.org>2014-06-12 15:36:40 +0200
commit585930123d2f411f7e6381d791bde3863c5f5af3 (patch)
treec52727e0d311642cd0cd7c621db4aeab4c484ad3
parent5d00c1a5ee4e3fc3a7a3aef2d1439dd83c4a7bd6 (diff)
layout: Do not expand struts to screen edges
set_builtin_struts() in mutter now handles this for us, so we can kill off the extra code here. https://bugzilla.gnome.org/show_bug.cgi?id=730527
-rw-r--r--js/ui/layout.js37
1 files changed, 0 insertions, 37 deletions
diff --git a/js/ui/layout.js b/js/ui/layout.js
index 67c0611e..cb838269 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -1017,43 +1017,6 @@ const LayoutManager = new Lang.Class({
else
continue;
- // Ensure that the strut rects goes all the way to the screen edge,
- // as this really what mutter expects. However skip this step
- // in cases where this would render an entire monitor unusable.
- switch (side) {
- case Meta.Side.TOP:
- let hasMonitorsAbove = this.monitors.some(Lang.bind(this,
- function(mon) {
- return this._isAboveOrBelowPrimary(mon) &&
- mon.y < primary.y;
- }));
- if (!hasMonitorsAbove)
- y1 = 0;
- break;
- case Meta.Side.BOTTOM:
- if (this.primaryIndex == this.bottomIndex)
- y2 = global.screen_height;
- break;
- case Meta.Side.LEFT:
- let hasMonitorsLeft = this.monitors.some(Lang.bind(this,
- function(mon) {
- return !this._isAboveOrBelowPrimary(mon) &&
- mon.x < primary.x;
- }));
- if (!hasMonitorsLeft)
- x1 = 0;
- break;
- case Meta.Side.RIGHT:
- let hasMonitorsRight = this.monitors.some(Lang.bind(this,
- function(mon) {
- return !this._isAboveOrBelowPrimary(mon) &&
- mon.x > primary.x;
- }));
- if (!hasMonitorsRight)
- x2 = global.screen_width;
- break;
- }
-
let strutRect = new Meta.Rectangle({ x: x1, y: y1, width: x2 - x1, height: y2 - y1});
let strut = new Meta.Strut({ rect: strutRect, side: side });
struts.push(strut);