From 8d6665b5c2ac1d42d72dab025623d3ae14291ccb Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine <vsavchuk@productengine.com> Date: Thu, 2 Feb 2012 13:29:24 +0200 Subject: [PATCH] Restoring a call to llround() in lllineeditor.cpp mistakenly removed in changeset 0a9ef58e8f7d. By the way, removing a pointless call to llround() in lldraghandle.cpp. --- indra/llui/lldraghandle.cpp | 2 +- indra/llui/lllineeditor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index 42e6c3c7862..5f69c6af315 100644 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -244,7 +244,7 @@ void LLDragHandleTop::reshapeTitleBox() const LLFontGL* font = LLFontGL::getFontSansSerif(); S32 title_width = getRect().getWidth(); title_width -= LEFT_PAD + 2 * BORDER_PAD + getButtonsRect().getWidth(); - S32 title_height = llround(font->getLineHeight()); + S32 title_height = font->getLineHeight(); LLRect title_rect; title_rect.setLeftTopAndSize( LEFT_PAD, diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index c53fb40ca2a..d600f58b963 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1630,7 +1630,7 @@ void LLLineEditor::draw() LLRect background( 0, getRect().getHeight(), getRect().getWidth(), 0 ); background.stretch( -mBorderThickness ); - S32 lineeditor_v_pad = (background.getHeight() - mGLFont->getLineHeight())/2; + S32 lineeditor_v_pad = llround(((F32)background.getHeight() - mGLFont->getLineHeight())/2); drawBackground(); -- GitLab