Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moving initial content focus from OnEndDocumentLoad to Show. Reinstating SetSizeFromXUL. reduces new window flashing and allows gtk windows to size from JS. r:hyatt@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@52036 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
danm%netscape.com
1999-10-28 01:52:49 +00:00
parent df0cb24c86
commit d5cb9410ae
2 changed files with 72 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
View File

@@ -251,6 +251,7 @@ nsWebShellWindow::nsWebShellWindow()
mChromeMask = NS_CHROME_ALL_CHROME;
mIntrinsicallySized = PR_FALSE;
mCreatedVisible = PR_TRUE;
mDebuting = PR_FALSE;
mLoadDefaultPage = PR_TRUE;
}
@@ -1743,15 +1744,35 @@ nsWebShellWindow::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTa
NS_IMETHODIMP
nsWebShellWindow::Show(PRBool aShow)
{
if (mDebuting)
return NS_OK;
mDebuting = PR_TRUE; // (Show/Focus is recursive)
mWebShell->Show(); // crimminy -- it doesn't take a parameter!
mWindow->Show(aShow);
// this may cause problems, focusing the content webshell on every show.
// still, this code's previous position, in OnEndDocumentLoad, was
// forcing the window visible too early. this made the window flash,
// as it was resized, and aggravated a gtk bug in which windows cannot
// be resized after they're made visible. yes, that wants fixing.
// repercussions were myriad. focusing here, instead.
nsCOMPtr<nsIWebShell> contentShell;
GetContentWebShell(getter_AddRefs(contentShell));
if (contentShell) {
nsCOMPtr<nsIDOMWindow> domWindow;
if (NS_SUCCEEDED(ConvertWebShellToDOMWindow(contentShell,
getter_AddRefs(domWindow)))) {
domWindow->Focus();
}
}
nsresult rv;
NS_WITH_SERVICE(nsIWindowMediator, windowMediator, kWindowMediatorCID, &rv);
if ( NS_SUCCEEDED(rv) )
{
windowMediator->UpdateWindowTimeStamp( this );
}
mDebuting = PR_FALSE;
return NS_OK;
}
@@ -1990,20 +2011,15 @@ nsWebShellWindow::OnEndDocumentLoad(nsIDocumentLoader* loader,
ShowAppropriateChrome();
LoadContentAreas();
if (mIntrinsicallySized)
mWebShell->SizeToContent();
else
SetSizeFromXUL();
// Here's where we service the "show" request initially given in Initialize()
if (mCreatedVisible)
Show(PR_TRUE);
nsCOMPtr<nsIWebShell> contentShell;
GetContentWebShell(getter_AddRefs(contentShell));
if (contentShell) {
nsCOMPtr<nsIDOMWindow> domWindow;
if (NS_SUCCEEDED(ConvertWebShellToDOMWindow(contentShell,
getter_AddRefs(domWindow)))) {
domWindow->Focus();
}
}
return NS_OK;
}
@@ -2244,6 +2260,47 @@ void nsWebShellWindow::ExecuteStartupCode()
mCallbacks->ConstructAfterJavaScript(mWebShell);
}
/* This simply reads attributes from the window tag and blindly sets the size
to whatever it finds within.
*/
void nsWebShellWindow::SetSizeFromXUL()
{
nsCOMPtr<nsIDOMNode> webshellNode = GetDOMNodeFromWebShell(mWebShell);
nsIWidget *windowWidget = GetWidget();
nsCOMPtr<nsIDOMElement> webshellElement;
nsString sizeString;
PRInt32 errorCode,
specWidth, specHeight,
specSize;
nsRect currentSize;
if (webshellNode)
webshellElement = do_QueryInterface(webshellNode);
if (!webshellElement || !windowWidget) // it's hopeless
return;
// first guess: use current size
mWindow->GetBounds(currentSize);
specWidth = currentSize.width;
specHeight = currentSize.height;
// read "height" attribute
if (NS_SUCCEEDED(webshellElement->GetAttribute("height", sizeString))) {
specSize = sizeString.ToInteger(&errorCode);
if (NS_SUCCEEDED(errorCode) && specSize > 0)
specHeight = specSize;
}
// read "width" attribute
if (NS_SUCCEEDED(webshellElement->GetAttribute("width", sizeString))) {
specSize = sizeString.ToInteger(&errorCode);
if (NS_SUCCEEDED(errorCode) || specSize > 0)
specWidth = specSize;
}
if (specWidth != currentSize.width || specHeight != currentSize.height)
windowWidget->Resize(specWidth, specHeight, PR_TRUE);
} // SetSizeFromXUL
void nsWebShellWindow::SetTitleFromXUL()