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

Refactored the handling of ComboBox item picking to make it faster and more reliable

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14433 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-09-02 17:01:44 +00:00
parent 959d78f755
commit 1e9722601c
2 changed files with 26 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osgUI/ComboBox
View File

@@ -74,7 +74,7 @@ public:
void setCurrentIndex(unsigned int i);
unsigned int getCurrentIndex() const { return _currentIndex; }
virtual void currrentIndexChanged(unsigned int i);
virtual void currentIndexChangedImplementation(unsigned int i);
@@ -87,8 +87,10 @@ public:
protected:
virtual ~ComboBox() {}
Items _items;
unsigned int _currentIndex;
Items _items;
unsigned int _currentIndex;
osg::Vec3d _popupItemOrigin;
osg::Vec3d _popupItemSize;
osg::ref_ptr<osg::Switch> _buttonSwitch;
osg::ref_ptr<osg::Switch> _backgroundSwitch;

75
src/osgUI/ComboBox.cpp
View File

@@ -86,67 +86,30 @@ bool ComboBox::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event
case(osgGA::GUIEventAdapter::PUSH):
{
OSG_NOTICE<<"Button pressed "<<std::endl;
// toggle visibility of popup.
//typedef osgUI::Widget::Intersections Intersections;
typedef osgUtil::LineSegmentIntersector::Intersections Intersections;
Intersections intersections;
osgGA::GUIActionAdapter* aa = ev ? ev->getActionAdapter() : 0;
osgGA::GUIEventAdapter* ea = event ? event->asGUIEventAdapter() : 0;
if ((aa && ea) && aa->computeIntersections(*ea, ev->getNodePath(), intersections))
// if ((aa && ea) && computeIntersections(ev, ea, intersections))
if (_popup->getVisible() && _popup->getHasEventFocus())
{
OSG_NOTICE<<"ComboBox intersections { "<<std::endl;
for(Intersections::const_iterator itr =intersections.begin();
itr!=intersections.end();
++itr)
osg::Vec3d position;
if (_popup->computeExtentsPositionInLocalCoordinates(ev, ea, position))
{
const osgUtil::LineSegmentIntersector::Intersection& hit = *itr;
OSG_NOTICE<<" hit:drawable "<<hit.drawable.get()<<", "<<hit.drawable->getName()<<std::endl;
OSG_NOTICE<<" NodePath::size() "<<hit.nodePath.size()<<std::endl;
}
OSG_NOTICE<<"}"<<std::endl;
const osgUtil::LineSegmentIntersector::Intersection& hit = *intersections.begin();
osg::Vec3d localPosition = hit.getLocalIntersectPoint();
if (_extents.contains(localPosition, 1e-6))
{
OSG_NOTICE<<"ComboBox button"<<std::endl;
_popup->setVisible(!_popup->getVisible());
}
if (_popup->getVisible() && _popup->getExtents().contains(localPosition, 1e-6))
{
OSG_NOTICE<<"In pop up"<<std::endl;
OSG_NOTICE<<" hit:drawable "<<hit.drawable.get()<<std::endl;
OSG_NOTICE<<" NodePath::size() "<<hit.nodePath.size()<<std::endl;
unsigned int index=_items.size();
for(osg::NodePath::const_reverse_iterator itr = hit.nodePath.rbegin();
itr != hit.nodePath.rend();
++itr)
position -= _popupItemOrigin;
position.x() /= _popupItemSize.x();
position.y() /= _popupItemSize.y();
int index = static_cast<int>(position.y());
if (index>=0 && index<static_cast<int>(_items.size()))
{
if ((*itr)==this) break;
if ((*itr)->getUserValue("index",index)) break;
}
if (index<_items.size())
{
OSG_NOTICE<<" index selected "<<index<<std::endl;
setCurrentIndex(index);
}
else
{
OSG_NOTICE<<" No index selected "<<std::endl;
}
_popup->setVisible(false);
}
_popup->setVisible(false);
}
else if (getHasEventFocus())
{
_popup->setVisible(!_popup->getVisible());
}
else
{
OSG_NOTICE<<"Toggling off ComboBox popup"<<std::endl;
_popup->setVisible(false);
return false;
}
break;
}
@@ -291,14 +254,19 @@ void ComboBox::createGraphicsImplementation()
float itemHeight = (_extents.yMax()-_extents.yMin()) - 2.0f*frameWidth;
float popupHeight = (itemHeight)* _items.size() + margin*static_cast<float>(_items.size()-1) + 2.0f*frameWidth;
float popupTop = _extents.yMin()-frameWidth-margin*1.0f;
float popupLeft = _extents.xMin()+30.0f;
float popupRight = _extents.xMax()+30.0f;
float popupLeft = _extents.xMin();
float popupRight = _extents.xMax();
osg::BoundingBox popupExtents(popupLeft, popupTop-popupHeight, _extents.zMin(), popupRight, popupTop, _extents.zMax());
_popup->setExtents(popupExtents);
osg::BoundingBox popupItemExtents(popupExtents.xMin()+frameWidth, popupTop-frameWidth-itemHeight, popupExtents.zMin(), popupExtents.xMax()-frameWidth, popupTop-frameWidth, popupExtents.zMax());
_popupItemOrigin.set(popupItemExtents.xMin(), popupItemExtents.yMax(), popupExtents.zMin());
_popupItemSize.set(popupItemExtents.xMax()-popupItemExtents.xMin(), -(itemHeight+margin), 0.0);
unsigned int index = 0;
for(Items::iterator itr = _items.begin();
itr != _items.end();
@@ -318,7 +286,6 @@ void ComboBox::createGraphicsImplementation()
// setup graphics for popup
{
osg::ref_ptr<osg::Group> group = new osg::Group;
group->setUserValue("index",index);
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()) );