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

Moved responsiblity for checking current event focus onto Widget::handleImplementations().

Browse Source 
Added support for closing CombinBox popup when the mouse is clicked outside the popup or combobox widget.


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14396 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-08-01 10:57:24 +00:00
parent e979f76156
commit ff78d30cee
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/osgUI/ComboBox.cpp
View File

@@ -40,6 +40,17 @@ bool ComboBox::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event
osgGA::GUIEventAdapter* ea = event->asGUIEventAdapter();
if (!ea) return false;
if (!getHasEventFocus())
{
if (ea->getEventType()==osgGA::GUIEventAdapter::PUSH && _popup->getVisible())
{
_popup->setVisible(false);
}
return false;
}
switch(ea->getEventType())
{
case(osgGA::GUIEventAdapter::SCROLL):
@@ -126,6 +137,10 @@ bool ComboBox::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event
_popup->setVisible(false);
}
}
else
{
_popup->setVisible(false);
}
break;
}
case(osgGA::GUIEventAdapter::RELEASE):

2
src/osgUI/LineEdit.cpp
View File

@@ -32,6 +32,8 @@ LineEdit::LineEdit(const osgUI::LineEdit& label, const osg::CopyOp& copyop):
bool LineEdit::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
{
if (!getHasEventFocus()) return false;
osgGA::GUIEventAdapter* ea = event->asGUIEventAdapter();
if (!ea) return false;

2
src/osgUI/PushButton.cpp
View File

@@ -32,6 +32,8 @@ PushButton::PushButton(const osgUI::PushButton& pb, const osg::CopyOp& copyop):
bool PushButton::handleImplementation(osgGA::EventVisitor* ev, osgGA::Event* event)
{
if (!getHasEventFocus()) return false;
osgGA::GUIEventAdapter* ea = event->asGUIEventAdapter();
if (!ea) return false;

21
src/osgUI/Widget.cpp
View File

@@ -212,20 +212,17 @@ void Widget::traverseImplementation(osg::NodeVisitor& nv)
// OSG_NOTICE<<"EventTraversal getHasEventFocus()="<<getHasEventFocus()<<std::endl;
if (getHasEventFocus())
{
// signify that event has been taken by widget with focus
ev->setEventHandled(true);
// signify that event has been taken by widget with focus
osgGA::EventQueue::Events& events = ev->getEvents();
for(osgGA::EventQueue::Events::iterator itr = events.begin();
itr != events.end();
++itr)
osgGA::EventQueue::Events& events = ev->getEvents();
for(osgGA::EventQueue::Events::iterator itr = events.begin();
itr != events.end();
++itr)
{
if (handle(ev, itr->get()))
{
if (handle(ev, itr->get()))
{
(*itr)->setHandled(true);
}
(*itr)->setHandled(true);
ev->setEventHandled(true);
}
}