mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-05 00:02:37 +00:00
fixed move mouse over selected item in dropdown, it will no longer hilite disabled items
Bug 72226 r=waterson sr=attinasi
This commit is contained in:
parent
755cc117c9
commit
f14a83706d
@ -3435,14 +3435,17 @@ nsListControlFrame::MouseMove(nsIDOMEvent* aMouseEvent)
|
||||
PRInt32 oldIndex;
|
||||
PRInt32 curIndex = mSelectedIndex;
|
||||
if (NS_SUCCEEDED(GetIndexFromDOMEvent(aMouseEvent, oldIndex, curIndex))) {
|
||||
mSelectedIndex = curIndex;
|
||||
mOldSelectedIndex = oldIndex;
|
||||
if (kNothingSelected != mSelectedIndex) {
|
||||
if (mOldSelectedIndex != mSelectedIndex) {
|
||||
if (mOldSelectedIndex != kNothingSelected) {
|
||||
SetContentSelected(mOldSelectedIndex, PR_FALSE);
|
||||
PRBool optionIsDisabled = PR_FALSE;
|
||||
if (NS_SUCCEEDED(IsTargetOptionDisabled(optionIsDisabled)) && !optionIsDisabled) {
|
||||
mSelectedIndex = curIndex;
|
||||
mOldSelectedIndex = oldIndex;
|
||||
if (kNothingSelected != mSelectedIndex) {
|
||||
if (mOldSelectedIndex != mSelectedIndex) {
|
||||
if (mOldSelectedIndex != kNothingSelected) {
|
||||
SetContentSelected(mOldSelectedIndex, PR_FALSE);
|
||||
}
|
||||
SetContentSelected(mSelectedIndex, PR_TRUE);
|
||||
}
|
||||
SetContentSelected(mSelectedIndex, PR_TRUE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3435,14 +3435,17 @@ nsListControlFrame::MouseMove(nsIDOMEvent* aMouseEvent)
|
||||
PRInt32 oldIndex;
|
||||
PRInt32 curIndex = mSelectedIndex;
|
||||
if (NS_SUCCEEDED(GetIndexFromDOMEvent(aMouseEvent, oldIndex, curIndex))) {
|
||||
mSelectedIndex = curIndex;
|
||||
mOldSelectedIndex = oldIndex;
|
||||
if (kNothingSelected != mSelectedIndex) {
|
||||
if (mOldSelectedIndex != mSelectedIndex) {
|
||||
if (mOldSelectedIndex != kNothingSelected) {
|
||||
SetContentSelected(mOldSelectedIndex, PR_FALSE);
|
||||
PRBool optionIsDisabled = PR_FALSE;
|
||||
if (NS_SUCCEEDED(IsTargetOptionDisabled(optionIsDisabled)) && !optionIsDisabled) {
|
||||
mSelectedIndex = curIndex;
|
||||
mOldSelectedIndex = oldIndex;
|
||||
if (kNothingSelected != mSelectedIndex) {
|
||||
if (mOldSelectedIndex != mSelectedIndex) {
|
||||
if (mOldSelectedIndex != kNothingSelected) {
|
||||
SetContentSelected(mOldSelectedIndex, PR_FALSE);
|
||||
}
|
||||
SetContentSelected(mSelectedIndex, PR_TRUE);
|
||||
}
|
||||
SetContentSelected(mSelectedIndex, PR_TRUE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user