Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync llcommon with Alchemy a bit.

Browse Source 
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
This commit is contained in:
Inusaito Sayori
2015-03-20 22:04:04 -04:00
parent 16a2b28c1b
commit 72080e79e9
135 changed files with 1940 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llfolderviewitem.cpp
View File

@@ -1091,7 +1091,7 @@ void LLFolderViewItem::draw()
if (filter_string_length > 0 && (mRoot->getSearchType() & 1))
{
std::string combined_string = mLabel + mLabelSuffix;
S32 left = llmath::llround(text_left) + font->getWidth(combined_string, 0, mStringMatchOffset) - 1;
S32 left = ll_round(text_left) + font->getWidth(combined_string, 0, mStringMatchOffset) - 1;
S32 right = left + font->getWidth(combined_string, mStringMatchOffset, filter_string_length) + 2;
S32 bottom = llfloor(getRect().getHeight() - font->getLineHeight() - 3 - TOP_PAD);
S32 top = getRect().getHeight() - TOP_PAD;
@@ -1228,7 +1228,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
{
S32 child_width = *width;
S32 child_height = 0;
S32 child_top = parent_item_height - llmath::llround(running_height);
S32 child_top = parent_item_height - ll_round(running_height);
target_height += folderp->arrange( &child_width, &child_height, filter_generation );
@@ -1254,7 +1254,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
{
S32 child_width = *width;
S32 child_height = 0;
S32 child_top = parent_item_height - llmath::llround(running_height);
S32 child_top = parent_item_height - ll_round(running_height);
target_height += itemp->arrange( &child_width, &child_height, filter_generation );
// don't change width, as this item is as wide as its parent folder by construction
@@ -1291,7 +1291,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
folders_t::iterator fit = iter++;
// number of pixels that bottom of folder label is from top of parent folder
if (getRect().getHeight() - (*fit)->getRect().mTop + (*fit)->getItemHeight()
> llmath::llround(mCurHeight) + MAX_FOLDER_ITEM_OVERLAP)
> ll_round(mCurHeight) + MAX_FOLDER_ITEM_OVERLAP)
{
// hide if beyond current folder height
(*fit)->setVisible(FALSE);
@@ -1304,7 +1304,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
items_t::iterator iit = iter++;
// number of pixels that bottom of item label is from top of parent folder
if (getRect().getHeight() - (*iit)->getRect().mBottom
> llmath::llround(mCurHeight) + MAX_FOLDER_ITEM_OVERLAP)
> ll_round(mCurHeight) + MAX_FOLDER_ITEM_OVERLAP)
{
(*iit)->setVisible(FALSE);
}
@@ -1316,12 +1316,12 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
}
// don't change width as this item is already as wide as its parent folder
reshape(getRect().getWidth(),llmath::llround(mCurHeight));
reshape(getRect().getWidth(),ll_round(mCurHeight));
// pass current height value back to parent
*height = llmath::llround(mCurHeight);
*height = ll_round(mCurHeight);
return llmath::llround(mTargetHeight);
return ll_round(mTargetHeight);
}
BOOL LLFolderViewFolder::needsArrange()