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

Introduce GUIEventHandler::handleWithCheckAgainstIgnoreHandledEventsMask() methods

Browse Source 
to help make it easier to get event handles to ingore events that have already been handled.
This commit is contained in:
Robert Osfield
2007-09-14 10:44:46 +00:00
parent 290adbe7ab
commit d5cc0e966f
6 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgGA/GUIEventHandler.cpp
View File

@@ -26,10 +26,7 @@ void GUIEventHandler::operator()(osg::Node* node, osg::NodeVisitor* nv)
itr != ev->getEvents().end();
++itr)
{
if (handle(*(*itr), *(ev->getActionAdapter()), node, nv))
{
(*itr)->setHandled(true);
}
handleWithCheckAgainstIgnoreHandledEventsMask(*(*itr), *(ev->getActionAdapter()), node, nv);
}
}
if (node->getNumChildrenRequiringEventTraversal()>0) traverse(node,nv);
@@ -44,7 +41,7 @@ void GUIEventHandler::event(osg::NodeVisitor* nv, osg::Drawable* drawable)
itr != ev->getEvents().end();
++itr)
{
handle(*(*itr), *(ev->getActionAdapter()), drawable, nv);
handleWithCheckAgainstIgnoreHandledEventsMask(*(*itr), *(ev->getActionAdapter()), drawable, nv);
}
}
}

4
src/osgViewer/CompositeViewer.cpp
View File

@@ -950,12 +950,12 @@ void CompositeViewer::eventTraversal()
hitr != view->getEventHandlers().end();
++hitr)
{
if ((*hitr)->handle( *event, *view, 0, 0)) event->setHandled(true);
(*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *view, 0, 0);
}
if (view->getCameraManipulator())
{
if (view->getCameraManipulator()->handle( *event, *view)) event->setHandled(true);
view->getCameraManipulator()->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *view);
}
}
}

2
src/osgViewer/GraphicsWindowX11.cpp
View File

@@ -457,7 +457,7 @@ void GraphicsWindowX11::init()
getEventQueue()->setCurrentEventState(osgGA::GUIEventAdapter::getAccumulatedEventState().get());
WindowData* inheritedWindowData = dynamic_cast<WindowData*>(_traits->inheritedWindowData.get());
// WindowData* inheritedWindowData = dynamic_cast<WindowData*>(_traits->inheritedWindowData.get());
_display = XOpenDisplay(_traits->displayName().c_str());

4
src/osgViewer/Viewer.cpp
View File

@@ -1327,12 +1327,12 @@ void Viewer::eventTraversal()
hitr != _eventHandlers.end();
++hitr)
{
if ((*hitr)->handle( *event, *this, 0, 0)) event->setHandled(true);
(*hitr)->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *this, 0, 0);
}
if (_cameraManipulator.valid())
{
if (_cameraManipulator->handle( *event, *this)) event->setHandled(true);
_cameraManipulator->handleWithCheckAgainstIgnoreHandledEventsMask( *event, *this);
}
}