Merge branch 'fix-pref-search' into 'master'

Fixed preferences search and some typos.

See merge request alchemy/alchemy!4

indra/llui/llsearchablecontrol.h

@@ -35,10 +35,10 @@ namespace ll
 	{
 		class SearchableControl
 		{
-			mutable bool mIsHighlighed;
+			mutable bool mIsHighlighted;
 		public:
 			SearchableControl()
-				: mIsHighlighed( false )
+				: mIsHighlighted( false )
 			{ }
 			virtual ~SearchableControl() = default;
 
@@ -50,11 +50,11 @@ namespace ll
 
 			void setHighlighted( bool aVal ) const
 			{
-				mIsHighlighed = aVal;
+				mIsHighlighted = aVal;
 				onSetHighlight( );
 			}
 			bool getHighlighted( ) const
-			{ return mIsHighlighed; }
+			{ return mIsHighlighted; }
 
 			std::string getSearchText() const
 			{ return _getSearchText(); } 

indra/newview/llfloaterpreference.cpp

@@ -3082,18 +3082,18 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 void LLFloaterPreference::onUpdateFilterTerm(bool force)
 {
-	LLWString seachValue = utf8str_to_wstring( mFilterEdit->getValue() );
-	LLWStringUtil::toLower( seachValue );
+	LLWString searchValue = utf8str_to_wstring( mFilterEdit->getValue() );
+	LLWStringUtil::toLower( searchValue );
 
-	if( !mSearchData || (mSearchData->mLastFilter == seachValue && !force))
+	if( !mSearchData || (mSearchData->mLastFilter == searchValue && !force))
 		return;
 
-	mSearchData->mLastFilter = seachValue;
+	mSearchData->mLastFilter = searchValue;
 
 	if( !mSearchData->mRootTab )
 		return;
 
-	mSearchData->mRootTab->hightlightAndHide( seachValue );
+	mSearchData->mRootTab->highlightAndHide( searchValue );
 	LLTabContainer *pRoot = getChild< LLTabContainer >( "pref core" );
 	if( pRoot )
 		pRoot->selectFirstTab();

indra/newview/llsearchableui.cpp

@@ -38,7 +38,7 @@ void ll::prefs::SearchableItem::setNotHighlighted()
 	mCtrl->setHighlighted( false );
 }
 
-bool ll::prefs::SearchableItem::hightlightAndHide( LLWString const &aFilter )
+bool ll::prefs::SearchableItem::highlightAndHide( LLWString const &aFilter )
 {
 	if( mCtrl->getHighlighted() )
 		return true;
@@ -65,38 +65,33 @@ bool ll::prefs::SearchableItem::hightlightAndHide( LLWString const &aFilter )
 ll::prefs::PanelData::~PanelData()
 {}
 
-bool ll::prefs::PanelData::hightlightAndHide( LLWString const &aFilter )
+bool ll::prefs::PanelData::highlightAndHide( LLWString const &aFilter )
 {
 	for (auto& itr : mChildren)
-        itr->setNotHighlighted( );
-
-	if (aFilter.empty())
-	{
-		return true;
-	}
+		itr->setNotHighlighted();
 
-	bool bVisible(false);
+	bool bVisible(mChildren.size() == 0 && aFilter.empty());
 	for (auto& itr : mChildren)
-        bVisible |= itr->hightlightAndHide( aFilter );
+		bVisible |= itr->highlightAndHide(aFilter);
 
 	for (auto& itr : mChildPanel)
-        bVisible |= itr->hightlightAndHide( aFilter );
+		bVisible |= itr->highlightAndHide(aFilter);
 
 	return bVisible;
 }
 
-bool ll::prefs::TabContainerData::hightlightAndHide( LLWString const &aFilter )
+bool ll::prefs::TabContainerData::highlightAndHide( LLWString const &aFilter )
 {
 	for (auto& itr : mChildren)
         itr->setNotHighlighted( );
 
 	bool bVisible(false);
 	for (auto& itr : mChildren)
-        bVisible |= itr->hightlightAndHide( aFilter );
+        bVisible |= itr->highlightAndHide( aFilter );
 
 	for (auto& itr : mChildPanel)
     {
-		bool bPanelVisible = itr->hightlightAndHide( aFilter );
+		bool bPanelVisible = itr->highlightAndHide( aFilter );
 		if(itr->mPanel )
 			mTabContainer->setTabVisibility(itr->mPanel, bPanelVisible );
 		bVisible |= bPanelVisible;
@@ -125,7 +120,7 @@ void ll::statusbar::SearchableItem::setNotHighlighted( )
 	}
 }
 
-bool ll::statusbar::SearchableItem::hightlightAndHide(LLWString const &aFilter, bool hide)
+bool ll::statusbar::SearchableItem::highlightAndHide(LLWString const &aFilter, bool hide)
 {
 	if ((mMenu && !mMenu->getVisible() && !mWasHiddenBySearch) || dynamic_cast<LLMenuItemTearOffGL*>(mMenu))
 		return false;
@@ -149,7 +144,7 @@ bool ll::statusbar::SearchableItem::hightlightAndHide(LLWString const &aFilter,
 
 	bool bVisible(false);
 	for (auto& itr : mChildren)
-        bVisible |= itr->hightlightAndHide(aFilter, !bHighlighted);
+        bVisible |= itr->highlightAndHide(aFilter, !bHighlighted);
 
 	if (mCtrl && !bVisible && !bHighlighted)
 	{

indra/newview/llsearchableui.h

@@ -60,7 +60,7 @@ namespace ll
 			virtual ~SearchableItem();
 
 			void setNotHighlighted();
-			virtual bool hightlightAndHide( LLWString const &aFilter );
+			virtual bool highlightAndHide( LLWString const &aFilter );
 		};
 
 		struct PanelData
@@ -73,13 +73,13 @@ namespace ll
 
 			virtual ~PanelData();
 
-			virtual bool hightlightAndHide( LLWString const &aFilter );
+			virtual bool highlightAndHide( LLWString const &aFilter );
 		};
 
 		struct TabContainerData: public PanelData
 		{
 			LLTabContainer *mTabContainer;
-			virtual bool hightlightAndHide( LLWString const &aFilter );
+			virtual bool highlightAndHide( LLWString const &aFilter );
 		};
 
 		struct SearchData
@@ -107,7 +107,7 @@ namespace ll
 			SearchableItem();
 
 			void setNotHighlighted( );
-			bool hightlightAndHide( LLWString const &aFilter, bool hide = true );
+			bool highlightAndHide( LLWString const &aFilter, bool hide = true );
 		};
 
 		struct SearchData

indra/newview/llstatusbar.cpp

@@ -706,7 +706,7 @@ void LLStatusBar::onUpdateFilterTerm()
 
 	mSearchData->mLastFilter = searchValue;
 
-	mSearchData->mRootMenu->hightlightAndHide( searchValue );
+	mSearchData->mRootMenu->highlightAndHide( searchValue );
 	gMenuBarView->needsArrange();
 }