nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1048230 - Global indicator inaccessible when taskbar is on top of the screen, r=Enn.

Browse source
This commit is contained in:
Florian Quèze 2014-08-19 17:50:10 +02:00
parent 2f5ceab2a1
commit c2cfac10fd
1 changed files with 9 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

13
browser/base/content/webrtcIndicator.js
View file

@ -131,10 +131,15 @@ let PositionHandler = {
// Center the window horizontally on the screen (not the available area). // Center the window horizontally on the screen (not the available area).
// Until we have moved the window to y=0, 'screen.width' may give a value // Until we have moved the window to y=0, 'screen.width' may give a value
// for a secondary screen, so use values from the screen manager instead. // for a secondary screen, so use values from the screen manager instead.
let primaryScreen = Cc["@mozilla.org/gfx/screenmanager;1"]
.getService(Ci.nsIScreenManager)
.primaryScreen;
let width = {}; let width = {};
Cc["@mozilla.org/gfx/screenmanager;1"].getService(Ci.nsIScreenManager) primaryScreen.GetRectDisplayPix({}, {}, width, {});
.primaryScreen.GetRectDisplayPix({}, {}, width, {}); let availTop = {};
window.moveTo((width.value - document.documentElement.clientWidth) / 2, 0); primaryScreen.GetAvailRectDisplayPix({}, availTop, {}, {});
window.moveTo((width.value - document.documentElement.clientWidth) / 2,
availTop.value);
} else { } else {
// This will ensure we're at y=0. // This will ensure we're at y=0.
this.setXPosition(window.screenX); this.setXPosition(window.screenX);
@ -145,7 +150,7 @@ let PositionHandler = {
let desiredX = Math.max(desiredX, screen.availLeft); let desiredX = Math.max(desiredX, screen.availLeft);
let maxX = let maxX =
screen.availLeft + screen.availWidth - document.documentElement.clientWidth; screen.availLeft + screen.availWidth - document.documentElement.clientWidth;
window.moveTo(Math.min(desiredX, maxX), 0); window.moveTo(Math.min(desiredX, maxX), screen.availTop);
}, },
handleEvent: function(aEvent) { handleEvent: function(aEvent) {
switch (aEvent.type) { switch (aEvent.type) {