fly/flightgear
1
0
Fork 0
Code Activity

canvas: Fix receiving keyboard events

Browse source
This commit is contained in:
Thomas Geymayer 2018-01-29 09:09:29 +01:00
parent 39f7fbf9fc
commit 193d7b1c6f
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Canvas/gui_mgr.cxx
View file

@ -134,6 +134,7 @@ class DesktopGroup:
uint32_t _last_key_down_no_mod {~0u}; // Key repeat for non modifier keys uint32_t _last_key_down_no_mod {~0u}; // Key repeat for non modifier keys
bool canHandleInput() const;
bool handleMouse(const osgGA::GUIEventAdapter& ea); bool handleMouse(const osgGA::GUIEventAdapter& ea);
bool handleKeyboard(const osgGA::GUIEventAdapter& ea); bool handleKeyboard(const osgGA::GUIEventAdapter& ea);
@ -288,10 +289,18 @@ const float resize_margin_pos = 12;
const float resize_margin_neg = 2; const float resize_margin_neg = 2;
const float resize_corner = 20; const float resize_corner = 20;
//------------------------------------------------------------------------------
bool DesktopGroup::canHandleInput() const
{
return _handle_events
&& _scene_group.valid()
&& _scene_group->getNumChildren() > 0;
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
bool DesktopGroup::handleMouse(const osgGA::GUIEventAdapter& ea) bool DesktopGroup::handleMouse(const osgGA::GUIEventAdapter& ea)
{ {
if( !_handle_events || !_scene_group || !_scene_group->getNumChildren() ) if( !canHandleInput() )
return false; return false;
sc::MouseEventPtr event(new sc::MouseEvent(ea)); sc::MouseEventPtr event(new sc::MouseEvent(ea));
@ -505,7 +514,7 @@ bool DesktopGroup::handleMouse(const osgGA::GUIEventAdapter& ea)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
bool DesktopGroup::handleKeyboard(const osgGA::GUIEventAdapter& ea) bool DesktopGroup::handleKeyboard(const osgGA::GUIEventAdapter& ea)
{ {
if( !_handle_events || !_scene_group || _scene_group->getNumChildren() ) if( !canHandleInput() )
return false; return false;
sc::KeyboardEventPtr event(new sc::KeyboardEvent(ea)); sc::KeyboardEventPtr event(new sc::KeyboardEvent(ea));