Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Notify the treeBoxObject when the row count changes -- should fix assertions when typing in autocomplete. Also, throw in some NS_NOTREACHED statements for functions that should not be getting called on this tree view.

Browse Source
This commit is contained in:
bryner%brianryner.com 2003-09-04 07:26:30 +00:00
parent 45271d5ae3
commit ef40198dcf
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
View File

@ -462,12 +462,14 @@ nsAutoCompleteController::GetImageSrc(PRInt32 row, const PRUnichar *colID, nsASt
NS_IMETHODIMP
nsAutoCompleteController::GetProgressMode(PRInt32 row, const PRUnichar *colID, PRInt32* _retval)
{
NS_NOTREACHED("tree has no progress cells");
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteController::GetCellValue(PRInt32 row, const PRUnichar *colID, nsAString& _retval)
{
NS_NOTREACHED("all of our cells are text");
return NS_OK;
}
@ -494,12 +496,14 @@ nsAutoCompleteController::IsContainer(PRInt32 index, PRBool *_retval)
NS_IMETHODIMP
nsAutoCompleteController::IsContainerOpen(PRInt32 index, PRBool *_retval)
{
NS_NOTREACHED("no container cells");
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteController::IsContainerEmpty(PRInt32 index, PRBool *_retval)
{
NS_NOTREACHED("no container cells");
return NS_OK;
}
@ -533,6 +537,7 @@ nsAutoCompleteController::ToggleOpenState(PRInt32 index)
NS_IMETHODIMP
nsAutoCompleteController::SetTree(nsITreeBoxObject *tree)
{
mTree = tree;
return NS_OK;
}
@ -837,6 +842,8 @@ nsAutoCompleteController::ProcessResult(PRInt32 aSearchIndex, nsIAutoCompleteRes
// If the search failed, increase the match count to include the error description
PRUint16 result = 0;
PRUint32 oldRowCount = mRowCount;
if (aResult)
aResult->GetSearchResult(&result);
if (result == nsIAutoCompleteResult::RESULT_FAILURE) {
@ -854,6 +861,9 @@ nsAutoCompleteController::ProcessResult(PRInt32 aSearchIndex, nsIAutoCompleteRes
CompleteDefaultIndex(aSearchIndex);
}
if (oldRowCount != mRowCount && mTree)
mTree->RowCountChanged(oldRowCount, mRowCount - oldRowCount);
// Refresh the popup view to display the new search results
nsCOMPtr<nsIAutoCompletePopup> popup;
mInput->GetPopup(getter_AddRefs(popup));
@ -899,8 +909,11 @@ nsAutoCompleteController::PostSearchCleanup()
nsresult
nsAutoCompleteController::ClearResults()
{
PRInt32 oldRowCount = mRowCount;
mRowCount = 0;
mResults->Clear();
if (oldRowCount != 0 && mTree)
mTree->RowCountChanged(0, -oldRowCount);
return NS_OK;
}

3
toolkit/components/autocomplete/src/nsAutoCompleteController.h
View File

@ -98,7 +98,8 @@ protected:
nsCOMPtr<nsITimer> mTimer;
nsCOMPtr<nsITreeSelection> mSelection;
nsCOMPtr<nsITreeBoxObject> mTree;
nsString mSearchString;
PRPackedBool mEnterAfterSearch;
PRPackedBool mNeedToComplete;