wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 412288 Toolbar menus do not have ATK state focusable patch by Marco Zehe r=ginn.chen, aaronleventhal sr=mtschrep

Browse Source
This commit is contained in:
ginn.chen@sun.com 2008-01-16 22:30:15 -08:00
parent c2a9789b6f
commit c54849840f
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
accessible/src/xul/nsXULMenuAccessible.cpp
View File

@ -51,8 +51,12 @@
#include "nsIContent.h" #include "nsIContent.h"
#include "nsGUIEvent.h" #include "nsGUIEvent.h"
#include "nsXULFormControlAccessible.h" #include "nsXULFormControlAccessible.h"
#include "nsILookAndFeel.h"
#include "nsWidgetsCID.h"
static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
/** ------------------------------------------------------ */ /** ------------------------------------------------------ */
/** Impl. of nsXULSelectableAccessible */ /** Impl. of nsXULSelectableAccessible */
/** ------------------------------------------------------ */ /** ------------------------------------------------------ */
@ -322,7 +326,9 @@ nsXULMenuitemAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState)
} }
// Combo box listitem // Combo box listitem
if (Role(this) == nsIAccessibleRole::ROLE_COMBOBOX_OPTION) { PRBool isComboboxOption =
(Role(this) == nsIAccessibleRole::ROLE_COMBOBOX_OPTION);
if (isComboboxOption) {
// Is selected? // Is selected?
PRBool isSelected = PR_FALSE; PRBool isSelected = PR_FALSE;
nsCOMPtr<nsIDOMXULSelectControlItemElement> nsCOMPtr<nsIDOMXULSelectControlItemElement>
@ -338,12 +344,6 @@ nsXULMenuitemAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState)
isCollapsed = PR_TRUE; isCollapsed = PR_TRUE;
} }
// Is disabled?
if (0 == (*aState & nsIAccessibleStates::STATE_UNAVAILABLE)) {
*aState |= (nsIAccessibleStates::STATE_FOCUSABLE |
nsIAccessibleStates::STATE_SELECTABLE);
}
if (isSelected) { if (isSelected) {
*aState |= nsIAccessibleStates::STATE_SELECTED; *aState |= nsIAccessibleStates::STATE_SELECTED;
@ -369,6 +369,23 @@ nsXULMenuitemAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState)
} // isSelected } // isSelected
} // ROLE_COMBOBOX_OPTION } // ROLE_COMBOBOX_OPTION
// Set focusable and selectable for items that are available
// and whose metric setting does allow disabled items to be focused.
if (*aState & nsIAccessibleStates::STATE_UNAVAILABLE) {
// Honour the LookAndFeel metric.
nsCOMPtr<nsILookAndFeel> lookNFeel(do_GetService(kLookAndFeelCID));
PRInt32 skipDisabledMenuItems = 0;
lookNFeel->GetMetric(nsILookAndFeel::eMetric_SkipNavigatingDisabledMenuItem,
skipDisabledMenuItems);
// We don't want the focusable and selectable states for combobox items,
// so exclude them here as well.
if (skipDisabledMenuItems || isComboboxOption) {
return NS_OK;
}
}
*aState|= (nsIAccessibleStates::STATE_FOCUSABLE |
nsIAccessibleStates::STATE_SELECTABLE);
return NS_OK; return NS_OK;
} }