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

Animate labels in pie menu during the popup effect; can be disabled via debug setting PieMenuPopupFontEffect

meow-7.2.2
Ansariel 2016-04-16 00:57:12 +02:00
parent 7bef7a5a48
commit 0079c0b281
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,17 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>PieMenuPopupFontEffect</key>
<map>
<key>Comment</key>
<string>If enabled, the labels in the pie menu slices are affected by the popup effect (they move into position).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AutohideChatBar</key>
<map>
<key>Comment</key>

5
indra/newview/piemenu.cpp
View File

@ -286,6 +286,7 @@ void PieMenu::draw()
borderColor = bgColor % (1.f - sPieMenuFade);
selectedColor = LLUIColorTable::instance().getColor("PieMenuSelectedColorOverride");
}
static LLCachedControl<bool> sPieMenuPopupFontEffect(gSavedSettings, "PieMenuPopupFontEffect");
// on first click, make the menu fade out to indicate "borderless" operation
if (mFirstClick)
@ -438,8 +439,8 @@ void PieMenu::draw()
// draw the slice labels around the center
mFont->renderUTF8(label,
0,
PIE_X[num],
PIE_Y[num],
PIE_X[num] * (sPieMenuPopupFontEffect() ? factor : 1.f),
PIE_Y[num] * (sPieMenuPopupFontEffect() ? factor : 1.f),
itemColor,
LLFontGL::HCENTER,
LLFontGL::VCENTER,