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

26
indra/llui/lltexteditor.cpp
View File

@@ -312,7 +312,7 @@ LLTextEditor::LLTextEditor(
updateTextRect();
S32 line_height = llmath::llround( mGLFont->getLineHeight() );
S32 line_height = ll_round( mGLFont->getLineHeight() );
S32 page_size = mTextRect.getHeight() / line_height;
// Init the scrollbar
@@ -970,7 +970,7 @@ S32 LLTextEditor::getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL rou
// Figure out which line we're nearest to.
S32 total_lines = getLineCount();
S32 line_height = llmath::llround( mGLFont->getLineHeight() );
S32 line_height = ll_round( mGLFont->getLineHeight() );
S32 max_visible_lines = mTextRect.getHeight() / line_height;
S32 scroll_lines = mScrollbar->getDocPos();
S32 visible_lines = llmin( total_lines - scroll_lines, max_visible_lines ); // Lines currently visible
@@ -2927,7 +2927,7 @@ void LLTextEditor::drawSelectionBackground()
const S32 text_len = getLength();
std::queue<S32> line_endings;
S32 line_height = llmath::llround( mGLFont->getLineHeight() );
S32 line_height = ll_round( mGLFont->getLineHeight() );
S32 selection_left = llmin( mSelectionStart, mSelectionEnd );
S32 selection_right = llmax( mSelectionStart, mSelectionEnd );
@@ -3122,7 +3122,7 @@ void LLTextEditor::drawMisspelled()
S32 line_end = 0;
// Determine if the cursor is visible and if so what its coordinates are.
while( (mTextRect.mBottom <= llmath::llround(text_y)) && (search_pos < num_lines))
while( (mTextRect.mBottom <= ll_round(text_y)) && (search_pos < num_lines))
{
line_end = text_len + 1;
S32 next_line = -1;
@@ -3197,7 +3197,7 @@ void LLTextEditor::drawCursor()
S32 line_end = 0;
// Determine if the cursor is visible and if so what its coordinates are.
while( (mTextRect.mBottom <= llmath::llround(text_y)) && (cur_pos < num_lines))
while( (mTextRect.mBottom <= ll_round(text_y)) && (cur_pos < num_lines))
{
line_end = text_len + 1;
S32 next_line = -1;
@@ -3316,7 +3316,7 @@ void LLTextEditor::drawPreeditMarker()
return;
}
const S32 line_height = llmath::llround( mGLFont->getLineHeight() );
const S32 line_height = ll_round( mGLFont->getLineHeight() );
S32 line_start = getLineStart(cur_line);
S32 line_y = mTextRect.mTop - line_height;
@@ -3436,7 +3436,7 @@ void LLTextEditor::drawText()
if (seg_iter == mSegments.end() || (*seg_iter)->getStart() > line_start) --seg_iter;
LLTextSegment* cur_segment = *seg_iter;
S32 line_height = llmath::llround( mGLFont->getLineHeight() );
S32 line_height = ll_round( mGLFont->getLineHeight() );
F32 text_y = (F32)(mTextRect.mTop - line_height);
while((mTextRect.mBottom <= text_y) && (cur_line < num_lines))
{
@@ -3461,7 +3461,7 @@ void LLTextEditor::drawText()
if( mShowLineNumbers && !cur_line_is_continuation)
{
const LLFontGL *num_font = LLFontGL::getFontMonospace();
F32 y_top = text_y + ((F32)llmath::llround(num_font->getLineHeight()) / 2);
F32 y_top = text_y + ((F32)ll_round(num_font->getLineHeight()) / 2);
BOOL is_cur_line = getCurrentLine() == cur_line_num;
const U8 style = is_cur_line ? LLFontGL::BOLD : LLFontGL::NORMAL;
const LLColor4 fg_color = is_cur_line ? mCursorColor : mReadOnlyFgColor;
@@ -3506,7 +3506,7 @@ void LLTextEditor::drawText()
S32 style_image_height = style->mImageHeight;
S32 style_image_width = style->mImageWidth;
LLUIImagePtr image = style->getImage();
image->draw(llmath::llround(text_x), llmath::llround(text_y)+line_height-style_image_height,
image->draw(ll_round(text_x), ll_round(text_y)+line_height-style_image_height,
style_image_width, style_image_height);
}
@@ -3593,7 +3593,7 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
}
}
F32 y_top = y + (F32)llmath::llround(font->getLineHeight());
F32 y_top = y + (F32)ll_round(font->getLineHeight());
if( selection_left > seg_start )
{
@@ -3996,7 +3996,7 @@ void LLTextEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
// propagate shape information to scrollbar
mScrollbar->setDocSize( getLineCount() );
S32 line_height = llmath::llround( mGLFont->getLineHeight() );
S32 line_height = ll_round( mGLFont->getLineHeight() );
S32 page_lines = mTextRect.getHeight() / line_height;
mScrollbar->setPageSize( page_lines );
}
@@ -5163,7 +5163,7 @@ BOOL LLTextEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect
}
const llwchar * const text = mWText.c_str();
const S32 line_height = llmath::llround(mGLFont->getLineHeight());
const S32 line_height = ll_round(mGLFont->getLineHeight());
if (coord)
{
@@ -5266,7 +5266,7 @@ void LLTextEditor::markAsPreedit(S32 position, S32 length)
S32 LLTextEditor::getPreeditFontSize() const
{
return llmath::llround(mGLFont->getLineHeight() * LLUI::getScaleFactor().mV[VY]);
return ll_round(mGLFont->getLineHeight() * LLUI::getScaleFactor().mV[VY]);
}
void LLTextEditor::setKeystrokeCallback(const keystroke_signal_t::slot_type& callback)