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

Switch pie menu over to ui-local transform matrix stack.

Browse Source
This commit is contained in:
Shyotl
2013-05-31 04:46:38 -05:00
parent ee1f1cdde2
commit a8b2a10c61
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llui/llmenugl.cpp
View File

@@ -3749,9 +3749,9 @@ void LLPieMenu::draw()
F32 center_y = height/2; F32 center_y = height/2;
S32 steps = 100; S32 steps = 100;
gGL.pushMatrix(); gGL.pushUIMatrix();
{ {
gGL.translatef(center_x, center_y, 0.f); gGL.translateUI(center_x, center_y, 0.f);
F32 line_width = LLUI::sConfigGroup->getF32("PieMenuLineWidth"); F32 line_width = LLUI::sConfigGroup->getF32("PieMenuLineWidth");
LLColor4 line_color = LLUI::sColorsGroup->getColor("PieMenuLineColor"); LLColor4 line_color = LLUI::sColorsGroup->getColor("PieMenuLineColor");
@@ -3799,7 +3799,7 @@ void LLPieMenu::draw()
LLUI::setLineWidth(1.0f); LLUI::setLineWidth(1.0f);
} }
gGL.popMatrix(); gGL.popUIMatrix();
mHoverThisFrame = FALSE; mHoverThisFrame = FALSE;
@@ -3815,9 +3815,9 @@ void LLPieMenu::drawBackground(LLMenuItemGL* itemp, LLColor4& color)
S32 steps = 100; S32 steps = 100;
gGL.color4fv( color.mV ); gGL.color4fv( color.mV );
gGL.pushMatrix(); gGL.pushUIMatrix();
{ {
gGL.translatef(center_x - itemp->getRect().mLeft, center_y - itemp->getRect().mBottom, 0.f); gGL.translateUI(center_x - itemp->getRect().mLeft, center_y - itemp->getRect().mBottom, 0.f);
item_list_t::iterator item_iter; item_list_t::iterator item_iter;
S32 i = 0; S32 i = 0;
@@ -3837,7 +3837,7 @@ void LLPieMenu::drawBackground(LLMenuItemGL* itemp, LLColor4& color)
i++; i++;
} }
} }
gGL.popMatrix(); gGL.popUIMatrix();
} }
// virtual // virtual