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

Improved handling of ComboBox popup toggling

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14432 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-09-02 10:00:33 +00:00
parent 30f4568f7b
commit 959d78f755
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osgUI/ComboBox.cpp
View File

@@ -40,7 +40,11 @@ bool ComboBox::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event
osgGA::GUIEventAdapter* ea = event->asGUIEventAdapter();
if (!ea) return false;
if (!getHasEventFocus())
bool hasFocus = getHasEventFocus() ||
(_popup->getVisible() && _popup->getHasEventFocus());
if (!hasFocus)
{
if (ea->getEventType()==osgGA::GUIEventAdapter::PUSH && _popup->getVisible())
{
@@ -84,14 +88,16 @@ bool ComboBox::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event
{
OSG_NOTICE<<"Button pressed "<<std::endl;
// toggle visibility of popup.
osgUI::Widget::Intersections intersections;
//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 ((aa && ea) && aa->computeIntersections(*ea, ev->getNodePath(), intersections))
// if ((aa && ea) && computeIntersections(ev, ea, intersections))
{
OSG_NOTICE<<"ComboBox intersections { "<<std::endl;
for(osgUI::Widget::Intersections::const_iterator itr =intersections.begin();
for(Intersections::const_iterator itr =intersections.begin();
itr!=intersections.end();
++itr)
{
@@ -139,6 +145,7 @@ bool ComboBox::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event
}
else
{
OSG_NOTICE<<"Toggling off ComboBox popup"<<std::endl;
_popup->setVisible(false);
}
break;
@@ -284,8 +291,8 @@ 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();
float popupRight = _extents.xMax();
float popupLeft = _extents.xMin()+30.0f;
float popupRight = _extents.xMax()+30.0f;
osg::BoundingBox popupExtents(popupLeft, popupTop-popupHeight, _extents.zMin(), popupRight, popupTop, _extents.zMax());
_popup->setExtents(popupExtents);