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

Backed out changeset: 4dfa5f564009

Liny 2013-04-08 08:37:28 -07:00
parent 9e69937798
commit d35a27933b
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/lltabcontainer.cpp
View File

@ -1786,7 +1786,6 @@ void LLTabContainer::setTabImage(LLPanel* child, LLIconCtrl* icon)
void LLTabContainer::reshapeTuple(LLTabTuple* tuple)
{
static LLUICachedControl<S32> tab_padding ("UITabPadding", 0);
static LLUICachedControl<S32> tab_vpadding ("UITabVPadding", 0);
if (!mIsVertical)
{
@ -1838,7 +1837,7 @@ void LLTabContainer::reshapeTuple(LLTabTuple* tuple)
tuple->mPadding = image_overlay_height;
tuple->mButton->reshape(tuple->mButton->getRect().getWidth(),
llclamp(mTabHeight + tab_vpadding + tuple->mPadding, mMinTabHeight, mMaxTabHeight));
llclamp(mTabHeight + tab_padding + tuple->mPadding, mMinTabHeight, mMaxTabHeight));
// add back in button height to total tab strip height
mTotalTabHeight += tuple->mButton->getRect().getHeight();

11
indra/newview/app_settings/settings.xml
View File

@ -15085,17 +15085,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>15</integer>
</map>
<key>UITabVPadding</key>
<map>
<key>Comment</key>
<string>UI Tab Padding</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>3</integer>
</map>
<key>UpdaterServiceSetting</key>
<map>
<key>Comment</key>