Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 23:23:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for nsbeta2+ 33735, r=joki

Browse Source
This commit is contained in:
saari%netscape.com 2000-05-24 08:28:41 +00:00
parent f12eb301af
commit 40ec711bc0
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/nsPresShell.cpp
View File

@ -3499,8 +3499,16 @@ PresShell::HandleEvent(nsIView *aView,
rv = frame->GetFrameForPoint(mPresContext, eventPoint, NS_FRAME_PAINT_LAYER_BACKGROUND, &mCurrentEventFrame);
if (rv != NS_OK) {
// XXX Is this the right thing to do?
#ifdef XP_MAC
// On the Mac it is possible to be running with no windows open, only the native menu bar.
// In this situation, we need to handle key board events but there are no frames, so
// we set mCurrentEventContent and that works itself out in HandleEventInternal.
mCurrentEventContent = mDocument->GetRootContent();
mCurrentEventFrame = nsnull;
#else
mCurrentEventFrame = frame;
aHandled = PR_FALSE;
#endif
rv = NS_OK;
}
}
@ -3564,8 +3572,8 @@ PresShell::HandleEvent(nsIView *aView,
PopCurrentEventInfo();
}
else {
rv = NS_OK;
aHandled = PR_FALSE;
rv = NS_OK;
}
return rv;

10
layout/html/base/src/nsPresShell.cpp
View File

@ -3499,8 +3499,16 @@ PresShell::HandleEvent(nsIView *aView,
rv = frame->GetFrameForPoint(mPresContext, eventPoint, NS_FRAME_PAINT_LAYER_BACKGROUND, &mCurrentEventFrame);
if (rv != NS_OK) {
// XXX Is this the right thing to do?
#ifdef XP_MAC
// On the Mac it is possible to be running with no windows open, only the native menu bar.
// In this situation, we need to handle key board events but there are no frames, so
// we set mCurrentEventContent and that works itself out in HandleEventInternal.
mCurrentEventContent = mDocument->GetRootContent();
mCurrentEventFrame = nsnull;
#else
mCurrentEventFrame = frame;
aHandled = PR_FALSE;
#endif
rv = NS_OK;
}
}
@ -3564,8 +3572,8 @@ PresShell::HandleEvent(nsIView *aView,
PopCurrentEventInfo();
}
else {
rv = NS_OK;
aHandled = PR_FALSE;
rv = NS_OK;
}
return rv;