Add callbacks for magnitude, moves and actions

When cursor is moved, the current item is informed of the actions
via callbacks. Eg. when cursor is moved up, the item that had the
cursor will have its movedUp signal fired. It is now also possible
to inform navigable items over incomplete movement, or the magnitude
of the movement. This may be used eg. to make buttons or elements to
flip/rotate to indicate that the cursor is about to be moved.

1 files changed, 8 insertions, 28 deletions

diff --git a/plugin/inputadapter.cpp b/plugin/inputadapter.cpp
index feb1373..52eba34 100644
--- a/plugin/inputadapter.cpp
+++ b/plugin/inputadapter.cpp
@@ -21,47 +21,39 @@ bool InputAdapter::eventFilter(QObject *object, QEvent *event)
     if (event->type() == QEvent::KeyPress) {
         QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
         return handleKeyEvent(keyEvent);
-    } else if (event->type() == QEvent::Wheel) {
-        QWheelEvent *wheelEvent = static_cast<QWheelEvent *>(event);
-        return handleWheelEvent(wheelEvent);
-    } else if (event->type() == QEvent::MouseMove) {
-        QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
-        return handleMouseEvent(mouseEvent);
     }
     return false;
 }
 
 bool InputAdapter::handleKeyEvent(QKeyEvent *event)
 {
-    CursorNavigationCommand cmd;
-    //detect arrow keys, tabs, enter and esc
     switch (event->key())
     {
     case Qt::Key_Left:
-        m_cursorNavigation->move(180, 0, true);
+        m_cursorNavigation->m_rootItem->moveLeft();
         break;
     case Qt::Key_Right:
-        m_cursorNavigation->move(0, 0, true);
+        m_cursorNavigation->m_rootItem->moveRight();
         break;
     case Qt::Key_Up:
-        m_cursorNavigation->move(-90, 0, true);
+        m_cursorNavigation->m_rootItem->moveUp();
         break;
     case Qt::Key_Down:
-        m_cursorNavigation->move(90, 0, true);
+        m_cursorNavigation->m_rootItem->moveDown();
         break;
     case Qt::Key_Return:
     case Qt::Key_Enter:
-        m_cursorNavigation->action(Activate);
+        m_cursorNavigation->m_rootItem->activate();
         break;
     case Qt::BackButton:
     case Qt::Key_Escape:
-        m_cursorNavigation->action(Escape);
+        m_cursorNavigation->m_rootItem->escape();
         break;
     case Qt::Key_Tab:
-        m_cursorNavigation->action(Forward);
+        m_cursorNavigation->m_rootItem->moveForward();
         break;
     case Qt::Key_Backtab:
-        m_cursorNavigation->action(Back);
+        m_cursorNavigation->m_rootItem->moveBack();
         break;
     default:
         return false;
@@ -69,15 +61,3 @@ bool InputAdapter::handleKeyEvent(QKeyEvent *event)
 
     return true;
 }
-
-bool InputAdapter::handleMouseEvent(QMouseEvent *event)
-{
-    //interpret mouse movement as omnnidirectional joystick movements for testing purposes
-    return false;
-}
-
-bool InputAdapter::handleWheelEvent(QWheelEvent *event)
-{
-    //turn wheel events into tabs
-    return false;
-}