From 89b061e318d431102b6f98f5da4663e6f1386039 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 25 May 2016 13:22:51 +0100 Subject: [PATCH] Fixed shadows warning --- src/osgUI/ComboBox.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/osgUI/ComboBox.cpp b/src/osgUI/ComboBox.cpp index 5dd1f70db..3ba25ee7b 100644 --- a/src/osgUI/ComboBox.cpp +++ b/src/osgUI/ComboBox.cpp @@ -277,19 +277,19 @@ void ComboBox::createGraphicsImplementation() // setup graphics for button { - osg::ref_ptr group = new osg::Group; - if (item->getColor().a()!=0.0f) group->addChild( style->createPanel(extents, item->getColor()) ); - if (!item->getText().empty()) group->addChild( style->createText(extents, getAlignmentSettings(), getTextSettings(), item->getText()) ); - _buttonSwitch->addChild(group.get()); + osg::ref_ptr button_group = new osg::Group; + if (item->getColor().a()!=0.0f) button_group->addChild( style->createPanel(extents, item->getColor()) ); + if (!item->getText().empty()) button_group->addChild( style->createText(extents, getAlignmentSettings(), getTextSettings(), item->getText()) ); + _buttonSwitch->addChild(button_group.get()); } // setup graphics for popup { - osg::ref_ptr group = new osg::Group; + osg::ref_ptr popup_group = new osg::Group; - if (item->getColor().a()!=0.0f) group->addChild( style->createPanel(popupItemExtents, item->getColor()) ); - if (!item->getText().empty()) group->addChild( style->createText(popupItemExtents, getAlignmentSettings(), getTextSettings(), item->getText()) ); - _popup->addChild(group.get()); + if (item->getColor().a()!=0.0f) popup_group->addChild( style->createPanel(popupItemExtents, item->getColor()) ); + if (!item->getText().empty()) popup_group->addChild( style->createText(popupItemExtents, getAlignmentSettings(), getTextSettings(), item->getText()) ); + _popup->addChild(popup_group.get()); popupItemExtents.yMin() -= (itemHeight+margin); popupItemExtents.yMax() -= (itemHeight+margin);