Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean up checking for a golden child menu. don't delete a golden child menu when setting the hidden attribute. that would be bad. r=saari/sr=sfraser/a=asa. bug# 136460

Browse Source
This commit is contained in:
pinkerton%netscape.com 2002-04-11 14:22:52 +00:00
parent 60b911495e
commit 021a93a7cd
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
widget/src/mac/nsMenu.cpp
View File

@ -186,7 +186,7 @@ nsMenu::~nsMenu()
NS_ASSERTION(err==noErr,"nsMenu::~nsMenu: DisposeUnicodeToTextRunInfo failed.");
// Don't destroy the 4 Golden Hierarchical Menu
if((mMacMenuID > 5) || (mMacMenuID < 2) && !mIsHelpMenu) {
if( !IsSpecialHierarchicalMenu(mMacMenuID) && !mIsHelpMenu) {
//printf("WARNING: DeleteMenu called!!! \n");
::DeleteMenu(mMacMenuID);
}
@ -938,8 +938,7 @@ NS_METHOD nsMenu::SetEnabled(PRBool aIsEnabled)
// Otherwise we're working with a single "golden child" menu shared by all hierarchicals
// so if we touch it, it will affect the display of every other hierarchical spawnded from
// this menu (which would be bad).
if ( gCurrentMenuDepth < 2 &&
(mMacMenuID > 5 || mMacMenuID < 2)) {
if ( gCurrentMenuDepth < 2 && !IsSpecialHierarchicalMenu(mMacMenuID) ) {
if ( aIsEnabled )
::EnableMenuItem(mMacMenuHandle, 0);
else
@ -1503,7 +1502,7 @@ nsMenu::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom *
// if we're a submenu, we don't have to go through all the gymnastics below
// to remove ourselves from the menubar and re-add the menu. We just invalidate
// our parent to change the text of the item.
if((mMacMenuID <= 5) && (mMacMenuID >= 2)) {
if ( IsSpecialHierarchicalMenu(mMacMenuID) ) {
nsCOMPtr<nsIMenuListener> listener = do_QueryInterface(mParent);
listener->SetRebuild(PR_TRUE);
return NS_OK;
@ -1548,8 +1547,11 @@ nsMenu::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom *
mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hiddenValue);
mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::collapsed, collapsedValue);
if(hiddenValue == NS_LITERAL_STRING("true") || collapsedValue == NS_LITERAL_STRING("true")) {
// hide this menu
::DeleteMenu(mMacMenuID);
if ( !IsSpecialHierarchicalMenu(mMacMenuID) ) {
// kill this menu, but not if we're special. baaaad things would happen if
// we did that.
::DeleteMenu(mMacMenuID);
}
}
else {
// Need to get the menuID of the next visible menu
@ -1610,3 +1612,16 @@ nsMenu :: ContentInserted(nsIDocument *aDocument, nsIContent *aChild, PRInt32 aI
return NS_OK;
} // ContentInserted
//
// IsSpecialHierarchicalMenu
//
// To get dynamic hierarchical menus, the mdef uses 4 "golden child" menus that it swaps in and out.
// Use this to identify them. They will have id's in the range [2, 5].
//
PRBool
nsMenu :: IsSpecialHierarchicalMenu ( PRInt32 inMenuId )
{
return (mMacMenuID <= 5) && (mMacMenuID >= 2);
}

2
widget/src/mac/nsMenu.h
View File

@ -150,6 +150,8 @@ protected:
// fetch the content node associated with the menupopup item
void GetMenuPopupContent ( nsIContent** aResult ) ;
PRBool IsSpecialHierarchicalMenu ( PRInt32 inMenuId ) ;
// fire handlers for oncreate/ondestroy
PRBool OnDestroy() ;
PRBool OnCreate() ;