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

Bug 13960: Update GFX combos when selection is set.

Browse Source
This commit is contained in:
pollmann%netscape.com 1999-09-16 22:36:29 +00:00
parent f75bd56e1d
commit 67b2692c32
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
layout/forms/nsListControlFrame.cpp
View File

@ -1626,23 +1626,26 @@ NS_IMETHODIMP
nsListControlFrame::SetOptionSelected(PRInt32 aIndex, PRBool aValue)
{
PRBool multiple;
GetMultiple(&multiple);
if (PR_TRUE == multiple) {
SetContentSelected(aIndex, aValue);
} else {
nsresult rv = GetMultiple(&multiple);
if (NS_SUCCEEDED(rv)) {
if (aValue) {
SetContentSelected(mSelectedIndex, PR_FALSE);
SetContentSelected(aIndex, PR_TRUE);
mSelectedIndex = aIndex;
ToggleSelected(aIndex); // sets mSelectedIndex
} else {
SetContentSelected(aIndex, PR_FALSE);
if (mSelectedIndex == aIndex) {
mSelectedIndex = -1;
SetContentSelected(aIndex, aValue);
if (!multiple) {
// Get the new selIndex from the DOM (may have changed)
PRInt32 selectedIndex;
GetSelectedIndexFromDOM(&selectedIndex);
if (mSelectedIndex != selectedIndex) {
ToggleSelected(selectedIndex); // sets mSelectedIndex
}
}
}
if (nsnull != mComboboxFrame) {
rv = mComboboxFrame->UpdateSelection(PR_FALSE, PR_TRUE, aIndex); // don't dispatch event
}
}
return NS_OK;
return rv;
}
//---------------------------------------------------------

27
layout/html/forms/src/nsListControlFrame.cpp
View File

@ -1626,23 +1626,26 @@ NS_IMETHODIMP
nsListControlFrame::SetOptionSelected(PRInt32 aIndex, PRBool aValue)
{
PRBool multiple;
GetMultiple(&multiple);
if (PR_TRUE == multiple) {
SetContentSelected(aIndex, aValue);
} else {
nsresult rv = GetMultiple(&multiple);
if (NS_SUCCEEDED(rv)) {
if (aValue) {
SetContentSelected(mSelectedIndex, PR_FALSE);
SetContentSelected(aIndex, PR_TRUE);
mSelectedIndex = aIndex;
ToggleSelected(aIndex); // sets mSelectedIndex
} else {
SetContentSelected(aIndex, PR_FALSE);
if (mSelectedIndex == aIndex) {
mSelectedIndex = -1;
SetContentSelected(aIndex, aValue);
if (!multiple) {
// Get the new selIndex from the DOM (may have changed)
PRInt32 selectedIndex;
GetSelectedIndexFromDOM(&selectedIndex);
if (mSelectedIndex != selectedIndex) {
ToggleSelected(selectedIndex); // sets mSelectedIndex
}
}
}
if (nsnull != mComboboxFrame) {
rv = mComboboxFrame->UpdateSelection(PR_FALSE, PR_TRUE, aIndex); // don't dispatch event
}
}
return NS_OK;
return rv;
}
//---------------------------------------------------------