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

fix for 29016 (again) don't pass the click through if there is a popup, just roll it up. this is what macOS native context menus do. r=sfraser.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@63227 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pinkerton%netscape.com 2000-03-17 01:42:19 +00:00
parent 272b6554a1
commit 3163a44acc
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/widget/src/mac/nsMacMessagePump.cpp
View File

@ -397,15 +397,20 @@ void nsMacMessagePump::DoMouseDown(EventRecord &anEvent)
case inMenuBar:
{
long menuResult = ::MenuSelect(anEvent.where);
if (HiWord(menuResult) != 0)
{
menuResult = ConvertOSMenuResultToPPMenuResult(menuResult);
DoMenu(anEvent, menuResult);
}
// If a xul popup is displayed, roll it up and don't allow the click
// through to the menu code. This is how MacOS context menus work, so
// I think this is a valid solution.
if ( gRollupListener && gRollupWidget )
gRollupListener->Rollup();
break;
else {
long menuResult = ::MenuSelect(anEvent.where);
if (HiWord(menuResult) != 0)
{
menuResult = ConvertOSMenuResultToPPMenuResult(menuResult);
DoMenu(anEvent, menuResult);
}
break;
}
}
case inContent: