livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'FirestormViewer:master' into FIRE-34747

meow-7.2.2
Angeldark Raymaker 2024-11-13 19:03:00 +00:00 committed by GitHub
parent 1b3b0862e0 73f1422aa4
commit 0f9776d867
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/llbutton.h
View File

@ -415,7 +415,10 @@ protected:
protected:
virtual std::string _getSearchText() const
{
return getLabelUnselected() + getToolTip();
// <FS:PP> Look in name attributes, making search independent from localization
// return getLabelUnselected() + getToolTip();
return getLabelUnselected() + getToolTip() + getName();
// </FS:PP>
}
};

5
indra/llui/llcheckboxctrl.h
View File

@ -143,7 +143,10 @@ private:
protected:
virtual std::string _getSearchText() const
{
return getLabel() + getToolTip();
// <FS:PP> Look in name attributes, making search independent from localization
// return getLabel() + getToolTip();
return getLabel() + getToolTip() + getName();
// </FS:PP>
}
virtual void onSetHighlight() const // When highlight, really do highlight the label

5
indra/llui/llcombobox.cpp
View File

@ -1120,7 +1120,10 @@ std::string LLComboBox::_getSearchText() const
iter++;
}
}
return res + getToolTip();
// <FS:PP> Look in name attributes, making search independent from localization
// return res + getToolTip();
return res + getToolTip() + getName();
// </FS:PP>
}
//virtual

5
indra/llui/llsliderctrl.h
View File

@ -140,7 +140,10 @@ protected:
std::string strLabel;
if( mLabelBox )
strLabel = mLabelBox->getLabel();
return strLabel + getToolTip();
// <FS:PP> Look in name attributes, making search independent from localization
// return strLabel + getToolTip();
return strLabel + getToolTip() + getName();
// </FS:PP>
}
virtual void onSetHighlight() const // When highlight, really do highlight the label
{

5
indra/llui/lltextbase.h
View File

@ -703,7 +703,10 @@ protected:
// virtual
std::string _getSearchText() const override
{
return mLabel.getString() + getToolTip();
// <FS:PP> Look in name attributes, making search independent from localization
// return mLabel.getString() + getToolTip();
return mLabel.getString() + getToolTip() + getName();
// </FS:PP>
}
std::vector<LLRect> getSelectionRects();

2
indra/newview/llstatusbar.cpp
View File

@ -488,7 +488,7 @@ bool LLStatusBar::postBuild()
// <FS:Beq> Make FPS a clickable button with contextual colour
// mFPSText = getChild<LLButton>("FPSText");
mFPSText = getChild<LLTextBox>("FPSText");
mFPSText->setClickedCallback(std::bind(&LLUrlAction::executeSLURL, "secondlife:///app/openfloater/preferences?search=limit%20framerate", true));
mFPSText->setClickedCallback(std::bind(&LLUrlAction::executeSLURL, "secondlife:///app/openfloater/preferences?search=limitframerate", true));
// </FS:Beq>
mVolumeIconsWidth = mBtnVolume->getRect().mRight - mStreamToggle->getRect().mLeft;