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

Making menus give feedback even when disabled. r=ben

Browse Source
This commit is contained in:
hyatt%netscape.com 2000-03-13 10:37:57 +00:00
parent 5a21dd583b
commit a33410c106
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/xul/base/src/nsMenuFrame.cpp
View File

@ -241,10 +241,7 @@ nsMenuFrame::HandleEvent(nsIPresContext* aPresContext,
NS_ENSURE_ARG_POINTER(aEventStatus);
*aEventStatus = nsEventStatus_eConsumeDoDefault;
if (IsDisabled()) // Disabled menus process no events.
return NS_OK;
if (aEvent->message == NS_KEY_PRESS) {
if (aEvent->message == NS_KEY_PRESS && !IsDisabled()) {
nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
PRUint32 keyCode = keyEvent->keyCode;
if (keyCode == NS_VK_UP || keyCode == NS_VK_DOWN) {
@ -252,7 +249,7 @@ nsMenuFrame::HandleEvent(nsIPresContext* aPresContext,
OpenMenu(PR_TRUE);
}
}
else if (aEvent->message == NS_MOUSE_LEFT_BUTTON_DOWN) {
else if (aEvent->message == NS_MOUSE_LEFT_BUTTON_DOWN && !IsDisabled()) {
PRBool isMenuBar = PR_FALSE;
if (mMenuParent)
mMenuParent->IsMenuBar(isMenuBar);
@ -271,14 +268,14 @@ nsMenuFrame::HandleEvent(nsIPresContext* aPresContext,
}
}
}
else if ( aEvent->message == NS_MOUSE_RIGHT_BUTTON_UP && mMenuParent ) {
else if ( aEvent->message == NS_MOUSE_RIGHT_BUTTON_UP && mMenuParent && !IsDisabled()) {
// if this menu is a context menu it accepts right-clicks...fire away!
PRBool isContextMenu = PR_FALSE;
mMenuParent->GetIsContextMenu(isContextMenu);
if ( isContextMenu )
Execute();
}
else if (aEvent->message == NS_MOUSE_LEFT_BUTTON_UP && !IsMenu() && mMenuParent) {
else if (aEvent->message == NS_MOUSE_LEFT_BUTTON_UP && !IsMenu() && mMenuParent && !IsDisabled()) {
// First, flip "checked" state if we're a checkbox menu, or
// an un-checked radio menu
if (mType == eMenuType_Checkbox ||
@ -340,7 +337,7 @@ nsMenuFrame::HandleEvent(nsIPresContext* aPresContext,
// If we're a menu (and not a menu item),
// kick off the timer.
if (!isMenuBar && IsMenu() && !mMenuOpen && !mOpenTimer) {
if (!IsDisabled() && !isMenuBar && IsMenu() && !mMenuOpen && !mOpenTimer) {
PRInt32 menuDelay = 300; // ms

3
layout/xul/base/src/nsMenuPopupFrame.cpp
View File

@ -1185,8 +1185,7 @@ nsMenuPopupFrame::IsValidItem(nsIContent* aContent)
nsCOMPtr<nsIAtom> tag;
aContent->GetTag(*getter_AddRefs(tag));
if (tag && (tag.get() == nsXULAtoms::menu ||
tag.get() == nsXULAtoms::menuitem) &&
!IsDisabled(aContent))
tag.get() == nsXULAtoms::menuitem))
return PR_TRUE;
return PR_FALSE;

20
xpfe/global/resources/skin/global.css
View File

@ -840,6 +840,22 @@ popup > menuitem[menuactive="true"] {
color: white;
}
menupopup > menu[menuactive="true"][disabled="true"] {
color: #999999;
}
popup > menu[menuactive="true"][disabled="true"] {
color: #999999;
}
menupopup > menuitem[menuactive="true"][disabled="true"] {
color: #999999;
}
popup > menuitem[menuactive="true"][disabled="true"] {
color: #999999;
}
.menu-right {
padding: 0px;
border: 0px;
@ -915,6 +931,10 @@ menu[disabled="true"] > .menu-right {
list-style-image: url("chrome://global/skin/menu-arrow-disabled.gif");
}
menu[menuactive="true"][disabled="true"] > .menu-right {
list-style-image: url("chrome://global/skin/menu-arrow-disabled.gif");
}
menu[menuactive="true"] > .menu-right {
list-style-image: url("chrome://global/skin/menu-arrow-hover.gif");
}