Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 794038 pt 1.1 - update nsWindowWatcher::SizeOpenedDocShellItem to use global display pixels for window manipulation. r=roc

Browse Source
This commit is contained in:
Jonathan Kew 2012-10-16 20:41:19 +01:00
parent 702db29c1c
commit b6844877ae
1 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
embedding/components/windowwatcher/src/nsWindowWatcher.cpp
View File

@ -1958,8 +1958,8 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
nsCOMPtr<nsIBaseWindow> treeOwnerAsWin(do_QueryInterface(treeOwner));
if (!treeOwnerAsWin) // we'll need this to actually size the docshell
return;
float devPixelsPerCSSPixel = 1.0;
double openerZoom = 1.0;
if (aParent) {
nsCOMPtr<nsIDOMDocument> openerDoc;
aParent->GetDocument(getter_AddRefs(openerDoc));
@ -1969,12 +1969,15 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
if (shell) {
nsPresContext* presContext = shell->GetPresContext();
if (presContext) {
devPixelsPerCSSPixel = presContext->CSSPixelsToDevPixels(1.0f);
openerZoom = presContext->GetFullZoom();
}
}
}
}
double scale;
treeOwnerAsWin->GetUnscaledDevicePixelsPerCSSPixel(&scale);
/* The current position and size will be unchanged if not specified
(and they fit entirely onscreen). Also, calculate the difference
between chrome and content sizes on aDocShellItem's window.
@ -1983,29 +1986,35 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
back from too far off the right or bottom edges of the screen. */
treeOwnerAsWin->GetPositionAndSize(&left, &top, &width, &height);
left = NSToIntRound(left / scale);
top = NSToIntRound(top / scale);
width = NSToIntRound(width / scale);
height = NSToIntRound(height / scale);
{ // scope shellWindow why not
nsCOMPtr<nsIBaseWindow> shellWindow(do_QueryInterface(aDocShellItem));
if (shellWindow) {
int32_t cox, coy;
double shellScale;
shellWindow->GetSize(&cox, &coy);
chromeWidth = width - cox;
chromeHeight = height - coy;
shellWindow->GetUnscaledDevicePixelsPerCSSPixel(&shellScale);
chromeWidth = width - NSToIntRound(cox / shellScale);
chromeHeight = height - NSToIntRound(coy / shellScale);
}
}
// Set up left/top
if (aSizeSpec.mLeftSpecified) {
left = NSToIntRound(aSizeSpec.mLeft * devPixelsPerCSSPixel);
left = NSToIntRound(aSizeSpec.mLeft * openerZoom);
}
if (aSizeSpec.mTopSpecified) {
top = NSToIntRound(aSizeSpec.mTop * devPixelsPerCSSPixel);
top = NSToIntRound(aSizeSpec.mTop * openerZoom);
}
// Set up width
if (aSizeSpec.mOuterWidthSpecified) {
if (!aSizeSpec.mUseDefaultWidth) {
width = NSToIntRound(aSizeSpec.mOuterWidth * devPixelsPerCSSPixel);
width = NSToIntRound(aSizeSpec.mOuterWidth * openerZoom);
} // Else specified to default; just use our existing width
}
else if (aSizeSpec.mInnerWidthSpecified) {
@ -2013,14 +2022,14 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
if (aSizeSpec.mUseDefaultWidth) {
width = width - chromeWidth;
} else {
width = NSToIntRound(aSizeSpec.mInnerWidth * devPixelsPerCSSPixel);
width = NSToIntRound(aSizeSpec.mInnerWidth * openerZoom);
}
}
// Set up height
if (aSizeSpec.mOuterHeightSpecified) {
if (!aSizeSpec.mUseDefaultHeight) {
height = NSToIntRound(aSizeSpec.mOuterHeight * devPixelsPerCSSPixel);
height = NSToIntRound(aSizeSpec.mOuterHeight * openerZoom);
} // Else specified to default; just use our existing height
}
else if (aSizeSpec.mInnerHeightSpecified) {
@ -2028,7 +2037,7 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
if (aSizeSpec.mUseDefaultHeight) {
height = height - chromeHeight;
} else {
height = NSToIntRound(aSizeSpec.mInnerHeight * devPixelsPerCSSPixel);
height = NSToIntRound(aSizeSpec.mInnerHeight * openerZoom);
}
}
@ -2079,8 +2088,8 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
int32_t winWidth = width + (sizeChromeWidth ? 0 : chromeWidth),
winHeight = height + (sizeChromeHeight ? 0 : chromeHeight);
screen->GetAvailRect(&screenLeft, &screenTop,
&screenWidth, &screenHeight);
screen->GetAvailRectDisplayPix(&screenLeft, &screenTop,
&screenWidth, &screenHeight);
if (aSizeSpec.SizeSpecified()) {
/* Unlike position, force size out-of-bounds check only if
@ -2096,12 +2105,12 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
width = screenWidth - (sizeChromeWidth ? 0 : chromeWidth);
}
if (left+winWidth > screenLeft+screenWidth)
left = screenLeft+screenWidth - winWidth;
if (left + winWidth > screenLeft + screenWidth)
left = screenLeft + screenWidth - winWidth;
if (left < screenLeft)
left = screenLeft;
if (top+winHeight > screenTop+screenHeight)
top = screenTop+screenHeight - winHeight;
if (top + winHeight > screenTop + screenHeight)
top = screenTop + screenHeight - winHeight;
if (top < screenTop)
top = screenTop;
if (top != oldTop || left != oldLeft)
@ -2111,20 +2120,24 @@ nsWindowWatcher::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDocShellItem,
// size and position the window
if (positionSpecified)
treeOwnerAsWin->SetPosition(left, top);
if (positionSpecified) {
treeOwnerAsWin->SetPosition(left * scale, top * scale);
// moving the window may have changed its scale factor
treeOwnerAsWin->GetUnscaledDevicePixelsPerCSSPixel(&scale);
}
if (aSizeSpec.SizeSpecified()) {
/* Prefer to trust the interfaces, which think in terms of pure
chrome or content sizes. If we have a mix, use the chrome size
adjusted by the chrome/content differences calculated earlier. */
if (!sizeChromeWidth && !sizeChromeHeight)
treeOwner->SizeShellTo(aDocShellItem, width, height);
if (!sizeChromeWidth && !sizeChromeHeight) {
treeOwner->SizeShellTo(aDocShellItem, width * scale, height * scale);
}
else {
if (!sizeChromeWidth)
width += chromeWidth;
if (!sizeChromeHeight)
height += chromeHeight;
treeOwnerAsWin->SetSize(width, height, false);
treeOwnerAsWin->SetSize(width * scale, height * scale, false);
}
}
treeOwnerAsWin->SetVisibility(true);