зеркало из https://github.com/mozilla/pjs.git
allowed windows with position specified to also specify size. deuglified some braces. couldn't help myself. bug 36219
This commit is contained in:
Родитель
f31aeddf12
Коммит
0fa27c4638
|
@ -2762,23 +2762,22 @@ NS_IMETHODIMP GlobalWindowImpl::SizeOpenedDocShellItem(nsIDocShellTreeItem *aDoc
|
||||||
nsCOMPtr<nsIBaseWindow> treeOwnerAsWin(do_QueryInterface(treeOwner));
|
nsCOMPtr<nsIBaseWindow> treeOwnerAsWin(do_QueryInterface(treeOwner));
|
||||||
NS_ENSURE_TRUE(treeOwnerAsWin, NS_ERROR_FAILURE);
|
NS_ENSURE_TRUE(treeOwnerAsWin, NS_ERROR_FAILURE);
|
||||||
|
|
||||||
if(sizeChrome)
|
if(sizeChrome) {
|
||||||
{
|
|
||||||
if(positionSpecified && sizeSpecified)
|
if(positionSpecified && sizeSpecified)
|
||||||
treeOwnerAsWin->SetPositionAndSize(chromeX, chromeY, chromeCX,
|
treeOwnerAsWin->SetPositionAndSize(chromeX, chromeY, chromeCX,
|
||||||
chromeCY, PR_FALSE);
|
chromeCY, PR_FALSE);
|
||||||
else if(sizeSpecified)
|
else {
|
||||||
treeOwnerAsWin->SetSize(chromeCX, chromeCY, PR_FALSE);
|
if(sizeSpecified)
|
||||||
else if(positionSpecified)
|
treeOwnerAsWin->SetSize(chromeCX, chromeCY, PR_FALSE);
|
||||||
treeOwnerAsWin->SetPosition(chromeX, chromeY);
|
if(positionSpecified)
|
||||||
|
treeOwnerAsWin->SetPosition(chromeX, chromeY);
|
||||||
}
|
}
|
||||||
else
|
} else {
|
||||||
{
|
|
||||||
if(positionSpecified)
|
if(positionSpecified)
|
||||||
treeOwnerAsWin->SetPosition(chromeX, chromeY);
|
treeOwnerAsWin->SetPosition(chromeX, chromeY);
|
||||||
else if(sizeSpecified)
|
if(sizeSpecified)
|
||||||
treeOwner->SizeShellTo(aDocShellItem, contentCX, contentCY);
|
treeOwner->SizeShellTo(aDocShellItem, contentCX, contentCY);
|
||||||
}
|
}
|
||||||
treeOwnerAsWin->SetVisibility(PR_TRUE);
|
treeOwnerAsWin->SetVisibility(PR_TRUE);
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче