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

layout: Use the mutter functions for doing monitor math

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=692680
This commit is contained in:
Jasper St. Pierre 2013-01-27 23:41:30 -05:00
parent d9b33e01ee
commit 60985b396a
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/ui/layout.js
View File

@ -634,36 +634,13 @@ const LayoutManager = new Lang.Class({
} }
}, },
_findMonitorForRect: function(x, y, w, h) {
// First look at what monitor the center of the rectangle is at
let cx = x + w/2;
let cy = y + h/2;
for (let i = 0; i < this.monitors.length; i++) {
let monitor = this.monitors[i];
if (cx >= monitor.x && cx < monitor.x + monitor.width &&
cy >= monitor.y && cy < monitor.y + monitor.height)
return i;
}
// If the center is not on a monitor, return the first overlapping monitor
for (let i = 0; i < this.monitors.length; i++) {
let monitor = this.monitors[i];
if (x + w > monitor.x && x < monitor.x + monitor.width &&
y + h > monitor.y && y < monitor.y + monitor.height)
return i;
}
// otherwise on no monitor
return -1;
},
// This call guarantees that we return some monitor to simplify usage of it // This call guarantees that we return some monitor to simplify usage of it
// In practice all tracked actors should be visible on some monitor anyway // In practice all tracked actors should be visible on some monitor anyway
findIndexForActor: function(actor) { findIndexForActor: function(actor) {
let [x, y] = actor.get_transformed_position(); let [x, y] = actor.get_transformed_position();
let [w, h] = actor.get_transformed_size(); let [w, h] = actor.get_transformed_size();
let i = this._findMonitorForRect(x, y, w, h); let rect = new Meta.Rectangle({ x: x, y: y, width: w, height: h });
if (i >= 0) return global.screen.get_monitor_index_for_rect(rect);
return i;
return this.primaryIndex; // Not on any monitor, pretend its on the primary
}, },
findMonitorForActor: function(actor) { findMonitorForActor: function(actor) {