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

Fix a crash, make Statistics look prettier

Browse Source 
Thanks, Aru!
This commit is contained in:
Lirusaito
2019-03-08 16:09:19 -05:00
parent 52245a7fef
commit a3493f5f6b
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llui/llstatbar.cpp
View File

@@ -175,17 +175,15 @@ void LLStatBar::draw()
LLFontGL::getFontMonospace()->renderUTF8(mLabel, 0, 0, getRect().getHeight(), LLColor4(1.f, 1.f, 1.f, 1.f),
LLFontGL::LEFT, LLFontGL::TOP);
std::string value_format;
std::string value_str;
if (!mUnitLabel.empty())
{
value_format = llformat( "%%.%df%%s", mPrecision);
value_str = llformat( value_format.c_str(), mValue, mUnitLabel.c_str());
value_str = llformat( "%.*f%s", mPrecision, mValue, mUnitLabel.c_str());
}
else
{
value_format = llformat( "%%.%df", mPrecision);
value_str = llformat( value_format.c_str(), mValue);
value_str = llformat("%.*f", mPrecision, mValue);
}
// Draw the value.
@@ -193,11 +191,8 @@ void LLStatBar::draw()
LLColor4(1.f, 1.f, 1.f, 0.5f),
LLFontGL::RIGHT, LLFontGL::TOP);
value_format = llformat( "%%.%df", mPrecision);
if (mDisplayBar)
{
std::string tick_label;
// Draw the tick marks.
F32 tick_value;
top = bar_top;
@@ -220,9 +215,8 @@ void LLStatBar::draw()
right = left + tick_width;
gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
tick_label = llformat( value_format.c_str(), tick_value);
// draw labels for the tick marks
LLFontGL::getFontMonospace()->renderUTF8(tick_label, 0, left - 1, bar_top - bar_height - tick_height,
LLFontGL::getFontMonospace()->renderUTF8(llformat("%.*f", mPrecision, tick_value), 0, left - 1, bar_top - bar_height - tick_height,
LLColor4(1.f, 1.f, 1.f, 0.5f),
LLFontGL::LEFT, LLFontGL::TOP);
}