FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Futher work on ComboBox/Popup

Browse Source
This commit is contained in:
Robert Osfield 2014-05-29 15:21:42 +00:00
parent a45ba05bdd
commit 189c0b3477
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/osgUI/ComboBox.cpp
View File

@ -68,6 +68,8 @@ bool ComboBox::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event
break; break;
case(osgGA::GUIEventAdapter::PUSH): case(osgGA::GUIEventAdapter::PUSH):
OSG_NOTICE<<"Button pressed "<<std::endl; OSG_NOTICE<<"Button pressed "<<std::endl;
// toggle visibility of popup.
if (_popup) _popup->setVisible(!_popup->getVisible());
break; break;
case(osgGA::GUIEventAdapter::RELEASE): case(osgGA::GUIEventAdapter::RELEASE):
OSG_NOTICE<<"Button release "<<std::endl; OSG_NOTICE<<"Button release "<<std::endl;
@ -103,21 +105,21 @@ void ComboBox::createGraphicsImplementation()
_buttonSwitch = new osg::Switch; _buttonSwitch = new osg::Switch;
_popup = new osgUI::Popup; _popup = new osgUI::Popup;
_popup->setVisible(true); _popup->setVisible(false);
if (!_items.empty()) if (!_items.empty())
{ {
float itemWidth = (_extents.xMax()-_extents.xMin()); float margin = (_extents.yMax()-_extents.yMin())*0.1f;
float itemHeight = (_extents.yMax()-_extents.yMin()); float itemWidth = (_extents.xMax()-_extents.xMin())-2.0f*margin;
float popupHeight = itemHeight * _items.size(); float itemHeight = (_extents.yMax()-_extents.yMin())-margin;
float gap = (_extents.yMax()-_extents.yMin())*0.1f; float popupHeight = itemHeight * _items.size() + 2.0f*margin;
float popupTop = _extents.yMin()-gap; float popupTop = _extents.yMin()-margin;
osg::BoundingBox popupExtents(_extents.xMin(), popupTop-popupHeight, _extents.zMin(), _extents.xMin()+itemWidth, popupTop, _extents.zMax()); osg::BoundingBox popupExtents(_extents.xMin(), popupTop-popupHeight, _extents.zMin(), _extents.xMin()+itemWidth+2*margin, popupTop, _extents.zMax());
_popup->setExtents(popupExtents); _popup->setExtents(popupExtents);
osg::BoundingBox popupItemExtents(_extents.xMin(), popupTop-itemHeight, _extents.zMin(), _extents.xMin()+itemWidth, popupTop, _extents.zMax()); osg::BoundingBox popupItemExtents(_extents.xMin()+margin, popupTop-margin-itemHeight, _extents.zMin(), _extents.xMin()+itemWidth, popupTop-margin, _extents.zMax());
for(Items::iterator itr = _items.begin(); for(Items::iterator itr = _items.begin();
itr != _items.end(); itr != _items.end();
@ -141,8 +143,8 @@ void ComboBox::createGraphicsImplementation()
if (!item->getText().empty()) group->addChild( style->createText(popupItemExtents, getAlignmentSettings(), getTextSettings(), item->getText()) ); if (!item->getText().empty()) group->addChild( style->createText(popupItemExtents, getAlignmentSettings(), getTextSettings(), item->getText()) );
_popup->addChild(group.get()); _popup->addChild(group.get());
popupItemExtents.yMin() -= itemHeight; popupItemExtents.yMin() -= (itemHeight+margin);
popupItemExtents.yMax() -= itemHeight; popupItemExtents.yMax() -= (itemHeight+margin);
} }
} }

2
src/osgUI/Popup.cpp
View File

@ -61,7 +61,7 @@ bool Popup::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
void Popup::leaveImplementation() void Popup::leaveImplementation()
{ {
setVisible(false); // setVisible(false);
} }
void Popup::createGraphicsImplementation() void Popup::createGraphicsImplementation()