Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

337646 Trouble with multiple sheets: going from a parent sheet to a child sheet back to a parent sheet puts the window in a bad state, causes blank sheet to appear and effectively hangs the app. Take care to not call ShowSheetWindow except when absolutely necessary. r=josh

Browse Source
This commit is contained in:
mark%moxienet.com 2006-05-30 15:45:23 +00:00
parent cd9f768a3b
commit 22cab1ed59
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
widget/src/mac/nsMacWindow.cpp
View File

@ -849,9 +849,9 @@ NS_IMETHODIMP nsMacWindow::Show(PRBool aState)
parentIsSheet) {
// If this sheet is the child of another sheet, hide the parent
// so that this sheet can be displayed.
// Leave the paren't mShown and mSheetNeedsShow alone, those are
// Leave the parent's mShown and mSheetNeedsShow alone, those are
// only used to handle sibling sheet contention. The parent will
// return once there are no more child sheets.
// be displayed again when it has no more child sheets.
::GetSheetWindowParent(parentWindowRef, &top);
::HideSheetWindow(parentWindowRef);
}
@ -861,19 +861,30 @@ NS_IMETHODIMP nsMacWindow::Show(PRBool aState)
if (NS_SUCCEEDED(piParentWidget->GetChildSheet(PR_TRUE,
&sheetShown)) &&
(!sheetShown || sheetShown == this)) {
::ShowSheetWindow(mWindowPtr, top);
if (!sheetShown) {
// There is no sheet on the top-level window, show this one.
// Important to set these member variables first, because
// ShowSheetWindow may result in native event dispatch causing
// reentrancy into this code for this window - if mSheetNeedsShow
// is true, it's possible to show the same sheet twice, and that
// will cause tremendous problems.
mShown = PR_TRUE;
mSheetNeedsShow = PR_FALSE;
::ShowSheetWindow(mWindowPtr, top);
}
UpdateWindowMenubar(parentWindowRef, PR_FALSE);
gEventDispatchHandler.DispatchGuiEvent(this, NS_GOTFOCUS);
gEventDispatchHandler.DispatchGuiEvent(this, NS_ACTIVATE);
ComeToFront();
mShown = PR_TRUE;
mSheetNeedsShow = PR_FALSE;
}
else
else {
// A sibling of this sheet is active, don't show this sheet yet.
// When the active sheet hides, its brothers and sisters that have
// mSheetNeedsShow set will have their opportunities to display.
mSheetNeedsShow = PR_TRUE;
}
}
}
else {