| -rw-r--r-- | core/launcher/desktop.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index fbcce7c..86527f6 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -352,6 +352,9 @@ bool DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keyc { + if ( db-> pressedAction ( ). channel ( )!="ignore") { + db-> pressedAction ( ). send ( ); } - else return false; + else + return false; } @@ -376,2 +379,3 @@ bool DesktopApplication::eventFilter ( QObject *o, QEvent *e ) { + if ( e-> type ( ) == QEvent::KeyPress || e-> type ( ) == QEvent::KeyRelease ) { @@ -382,3 +386,4 @@ bool DesktopApplication::eventFilter ( QObject *o, QEvent *e ) if ( db ) { - return checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( )); + if (checkButtonAction ( db, ke-> key ( ), e-> type ( ) == QEvent::KeyPress, ke-> isAutoRepeat ( ))) + return true; //checkButtonAction retrune false if events should be routed through } @@ -667,4 +672,2 @@ void Desktop::togglePower() - qDebug ( "togglePower (locked == %d)", excllock ? 1 : 0 ); - if ( excllock ) |