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

Sat, 16 Apr 2016 00:57:12 +0200

author
Ansariel
date
Sat, 16 Apr 2016 00:57:12 +0200
changeset 48950
b08e631b4fb7
parent 48949
1cd8af2124d0
child 48951
42afbe8657cf

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

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/piemenu.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Sat Apr 16 00:47:45 2016 +0200
     1.2 +++ b/indra/newview/app_settings/settings.xml	Sat Apr 16 00:57:12 2016 +0200
     1.3 @@ -109,6 +109,17 @@
     1.4      <key>Value</key>
     1.5      <integer>1</integer>
     1.6    </map>
     1.7 +  <key>PieMenuPopupFontEffect</key>
     1.8 +  <map>
     1.9 +    <key>Comment</key>
    1.10 +    <string>If enabled, the labels in the pie menu slices are affected by the popup effect (they move into position).</string>
    1.11 +    <key>Persist</key>
    1.12 +    <integer>1</integer>
    1.13 +    <key>Type</key>
    1.14 +    <string>Boolean</string>
    1.15 +    <key>Value</key>
    1.16 +    <integer>1</integer>
    1.17 +  </map>
    1.18    <key>AutohideChatBar</key>
    1.19    <map>
    1.20      <key>Comment</key>
     2.1 --- a/indra/newview/piemenu.cpp	Sat Apr 16 00:47:45 2016 +0200
     2.2 +++ b/indra/newview/piemenu.cpp	Sat Apr 16 00:57:12 2016 +0200
     2.3 @@ -286,6 +286,7 @@
     2.4  		borderColor = bgColor % (1.f - sPieMenuFade);
     2.5  		selectedColor = LLUIColorTable::instance().getColor("PieMenuSelectedColorOverride");
     2.6  	}
     2.7 +	static LLCachedControl<bool> sPieMenuPopupFontEffect(gSavedSettings, "PieMenuPopupFontEffect");
     2.8  
     2.9  	// on first click, make the menu fade out to indicate "borderless" operation
    2.10  	if (mFirstClick)
    2.11 @@ -438,8 +439,8 @@
    2.12  		// draw the slice labels around the center
    2.13  		mFont->renderUTF8(label,
    2.14  							0,
    2.15 -							PIE_X[num],
    2.16 -							PIE_Y[num],
    2.17 +							PIE_X[num] * (sPieMenuPopupFontEffect() ? factor : 1.f),
    2.18 +							PIE_Y[num] * (sPieMenuPopupFontEffect() ? factor : 1.f),
    2.19  							itemColor,
    2.20  							LLFontGL::HCENTER,
    2.21  							LLFontGL::VCENTER,

mercurial