move the focus on tap to CApplication::OnEvent() rather than being in…

… the touch handler
xbmc · Apr 6, 2013 · d68d97c · d68d97c
1 parent 823265a
commit d68d97c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -532,6 +532,19 @@ bool CApplication::OnEvent(XBMC_Event& newEvent)
     case XBMC_TOUCH:
     {
       int windowId = g_windowManager.GetActiveWindow() & WINDOW_ID_MASK;
+
+      if (newEvent.touch.action == ACTION_TOUCH_TAP)
+      {
+        // Send a mouse motion event for getting the current guiitem selected
+        XBMC_Event mouseEvent;
+        memset(&mouseEvent, 0, sizeof(mouseEvent));
+
+        mouseEvent.type = XBMC_MOUSEMOTION;
+        mouseEvent.motion.type = XBMC_MOUSEMOTION;
+        mouseEvent.motion.x = newEvent.touch.x;
+        mouseEvent.motion.y = newEvent.touch.y;
+        OnEvent(mouseEvent);
+      }
       int actionId = 0;
       if (newEvent.touch.action == ACTION_GESTURE_BEGIN || newEvent.touch.action == ACTION_GESTURE_END)
       {

diff --git a/xbmc/input/touch/generic/GenericTouchActionHandler.cpp b/xbmc/input/touch/generic/GenericTouchActionHandler.cpp
@@ -101,7 +101,6 @@ void CGenericTouchActionHandler::OnTap(float x, float y, int32_t pointers /* = 1
   if (pointers <= 0 || pointers > 10)
     return;
 
-  focusControl(x, y);
   sendEvent(ACTION_TOUCH_TAP, (uint16_t)x, (uint16_t)y, 0.0f, 0.0f, pointers);
 }